aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitalii Tomkiv <vitalit@google.com>2016-05-21 00:25:51 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-21 00:25:51 +0000
commit60e2ab3c8e7d200d6f25b8359a910c1ecba7d4bd (patch)
tree2c6809bd374b1e01b9608a81ab8877fa79dcda19
parentd9156fae44424cd63a8b8288880f26b3e9d7160a (diff)
parent724d95ba5fda4bef577e1d97574c89077e447702 (diff)
downloadCar-nougat-mr1-dev.tar.gz
am: 724d95ba5f * commit '724d95ba5fda4bef577e1d97574c89077e447702': Mark CarAppContextManager as @hide. Change-Id: I0ff0f0a7fd76f94cc603d6405e9e5b3a5b8e1d99
-rw-r--r--car-lib/api/current.txt20
-rw-r--r--car-lib/api/system-current.txt20
-rw-r--r--car-lib/src/android/car/CarAppContextManager.java1
-rw-r--r--car-support-lib/api/current.txt20
-rw-r--r--car-support-lib/src/android/support/car/CarAppContextManager.java1
5 files changed, 2 insertions, 60 deletions
diff --git a/car-lib/api/current.txt b/car-lib/api/current.txt
index 3983d3f00d..7bec186d5b 100644
--- a/car-lib/api/current.txt
+++ b/car-lib/api/current.txt
@@ -20,26 +20,6 @@ package android.car {
field public static final java.lang.String SENSOR_SERVICE = "sensor";
}
- public class CarAppContextManager {
- method public int getActiveAppContexts() throws android.car.CarNotConnectedException;
- method public boolean isOwningContext(int) throws android.car.CarNotConnectedException;
- method public void onCarDisconnected();
- method public void registerContextListener(android.car.CarAppContextManager.AppContextChangeListener, int) throws android.car.CarNotConnectedException;
- method public void resetActiveContexts(int) throws android.car.CarNotConnectedException;
- method public void setActiveContexts(android.car.CarAppContextManager.AppContextOwnershipChangeListener, int) throws android.car.CarNotConnectedException, java.lang.SecurityException;
- method public void unregisterContextListener() throws android.car.CarNotConnectedException;
- field public static final int APP_CONTEXT_NAVIGATION = 1; // 0x1
- field public static final int APP_CONTEXT_VOICE_COMMAND = 2; // 0x2
- }
-
- public static abstract interface CarAppContextManager.AppContextChangeListener {
- method public abstract void onAppContextChange(int);
- }
-
- public static abstract interface CarAppContextManager.AppContextOwnershipChangeListener {
- method public abstract void onAppContextOwnershipLoss(int);
- }
-
public class CarInfoManager {
method public java.lang.Float getFloat(java.lang.String) throws android.car.CarNotConnectedException, java.lang.IllegalArgumentException;
method public java.lang.Integer getInt(java.lang.String) throws android.car.CarNotConnectedException, java.lang.IllegalArgumentException;
diff --git a/car-lib/api/system-current.txt b/car-lib/api/system-current.txt
index 7a64baa451..b6fdd907b1 100644
--- a/car-lib/api/system-current.txt
+++ b/car-lib/api/system-current.txt
@@ -32,26 +32,6 @@ package android.car {
field public static final java.lang.String TEST_SERVICE = "car-service-test";
}
- public class CarAppContextManager {
- method public int getActiveAppContexts() throws android.car.CarNotConnectedException;
- method public boolean isOwningContext(int) throws android.car.CarNotConnectedException;
- method public void onCarDisconnected();
- method public void registerContextListener(android.car.CarAppContextManager.AppContextChangeListener, int) throws android.car.CarNotConnectedException;
- method public void resetActiveContexts(int) throws android.car.CarNotConnectedException;
- method public void setActiveContexts(android.car.CarAppContextManager.AppContextOwnershipChangeListener, int) throws android.car.CarNotConnectedException, java.lang.SecurityException;
- method public void unregisterContextListener() throws android.car.CarNotConnectedException;
- field public static final int APP_CONTEXT_NAVIGATION = 1; // 0x1
- field public static final int APP_CONTEXT_VOICE_COMMAND = 2; // 0x2
- }
-
- public static abstract interface CarAppContextManager.AppContextChangeListener {
- method public abstract void onAppContextChange(int);
- }
-
- public static abstract interface CarAppContextManager.AppContextOwnershipChangeListener {
- method public abstract void onAppContextOwnershipLoss(int);
- }
-
public class CarInfoManager {
method public java.lang.Float getFloat(java.lang.String) throws android.car.CarNotConnectedException, java.lang.IllegalArgumentException;
method public java.lang.Integer getInt(java.lang.String) throws android.car.CarNotConnectedException, java.lang.IllegalArgumentException;
diff --git a/car-lib/src/android/car/CarAppContextManager.java b/car-lib/src/android/car/CarAppContextManager.java
index c7657ca579..5eb4c569e5 100644
--- a/car-lib/src/android/car/CarAppContextManager.java
+++ b/car-lib/src/android/car/CarAppContextManager.java
@@ -30,6 +30,7 @@ import java.util.Map;
* like active navigation or active voice command. Usually only one instance of such application
* should run in the system, and other app setting the flag for the matching app should
* lead into other app to stop.
+ * @hide
*/
public class CarAppContextManager implements CarManagerBase {
/**
diff --git a/car-support-lib/api/current.txt b/car-support-lib/api/current.txt
index 4361a64eaa..1256f7f09b 100644
--- a/car-support-lib/api/current.txt
+++ b/car-support-lib/api/current.txt
@@ -29,26 +29,6 @@ package android.support.car {
field public static final java.lang.String SENSOR_SERVICE = "sensor";
}
- public abstract class CarAppContextManager {
- ctor public CarAppContextManager();
- method public abstract int getActiveAppContexts() throws android.support.car.CarNotConnectedException;
- method public abstract boolean isOwningContext(int) throws android.support.car.CarNotConnectedException;
- method public abstract void registerContextListener(android.support.car.CarAppContextManager.AppContextChangeListener, int) throws android.support.car.CarNotConnectedException;
- method public abstract void resetActiveContexts(int) throws android.support.car.CarNotConnectedException;
- method public abstract void setActiveContexts(android.support.car.CarAppContextManager.AppContextOwnershipChangeListener, int) throws android.support.car.CarNotConnectedException, java.lang.IllegalStateException, java.lang.SecurityException;
- method public abstract void unregisterContextListener() throws android.support.car.CarNotConnectedException;
- field public static final int APP_CONTEXT_NAVIGATION = 1; // 0x1
- field public static final int APP_CONTEXT_VOICE_COMMAND = 2; // 0x2
- }
-
- public static abstract interface CarAppContextManager.AppContextChangeListener {
- method public abstract void onAppContextChange(int);
- }
-
- public static abstract interface CarAppContextManager.AppContextOwnershipChangeListener {
- method public abstract void onAppContextOwnershipLoss(int);
- }
-
public abstract interface CarConnectionListener {
method public abstract void onConnected(int);
method public abstract void onDisconnected();
diff --git a/car-support-lib/src/android/support/car/CarAppContextManager.java b/car-support-lib/src/android/support/car/CarAppContextManager.java
index 70616b93b0..837dd9cf03 100644
--- a/car-support-lib/src/android/support/car/CarAppContextManager.java
+++ b/car-support-lib/src/android/support/car/CarAppContextManager.java
@@ -21,6 +21,7 @@ package android.support.car;
* like active navigation or active voice command. Usually only one instance of such application
* should run in the system, and other app setting the flag for the matching app should
* lead into other app to stop.
+ * @hide
*/
public abstract class CarAppContextManager implements CarManagerBase {
/**