summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorCraig Lafayette <craiglafa@google.com>2015-05-06 16:57:01 -0400
committerCraig Lafayette <craiglafa@google.com>2015-05-06 17:24:20 -0400
commit9ef04bfb0711d54fc951ca79d38c4d14a0cc817a (patch)
tree8020ac74ba7ce1fd3d2e85c270f3cb56a800cdf8 /api
parent6223ec129b256526d8c30920271b2ee3960bcf1f (diff)
downloadframeworks_base-9ef04bfb0711d54fc951ca79d38c4d14a0cc817a.zip
frameworks_base-9ef04bfb0711d54fc951ca79d38c4d14a0cc817a.tar.gz
frameworks_base-9ef04bfb0711d54fc951ca79d38c4d14a0cc817a.tar.bz2
DeviceInitializerStatus API review changes
- Remove DeviceInitializerStatus.is*Status() - Remove DeviceInitializerStatus.FLAG_STATUS_RESERVED - Rename STATUS_STATE_CONNECT_BLUETOOTH_PROXY to STATUS_STATE_CONNECTING_BLUETOOTH_PROXY - Rename STATUS_STATE_DISCONNECT_BLUETOOTH_PROXY to STATUS_STATE_DISCONNECTING_BLUETOOTH_PROXY Bug: 20819590 Change-Id: I276c5674a36726d3681dcc29e896ad39888d116d
Diffstat (limited to 'api')
-rw-r--r--api/current.txt7
-rw-r--r--api/system-current.txt7
2 files changed, 4 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt
index 375bee7..0aa8861 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -5696,9 +5696,6 @@ package android.app.admin {
}
public class DeviceInitializerStatus {
- method public static boolean isCustomStatus(int);
- method public static boolean isErrorStatus(int);
- method public static boolean isHighPriority(int);
field public static final int FLAG_STATUS_CUSTOM = 33554432; // 0x2000000
field public static final int FLAG_STATUS_ERROR = 16777216; // 0x1000000
field public static final int FLAG_STATUS_HIGH_PRIORITY = 134217728; // 0x8000000
@@ -5710,9 +5707,9 @@ package android.app.admin {
field public static final int STATUS_ERROR_INSTALL_PACKAGE = 16777240; // 0x1000018
field public static final int STATUS_ERROR_RESET_PROTECTION_BLOCKING_PROVISIONING = 16777238; // 0x1000016
field public static final int STATUS_ERROR_SET_DEVICE_POLICY = 16777241; // 0x1000019
- field public static final int STATUS_STATE_CONNECT_BLUETOOTH_PROXY = 134217736; // 0x8000008
+ field public static final int STATUS_STATE_CONNECTING_BLUETOOTH_PROXY = 134217736; // 0x8000008
field public static final int STATUS_STATE_DEVICE_PROVISIONED = 134217738; // 0x800000a
- field public static final int STATUS_STATE_DISCONNECT_BLUETOOTH_PROXY = 134217737; // 0x8000009
+ field public static final int STATUS_STATE_DISCONNECTING_BLUETOOTH_PROXY = 134217737; // 0x8000009
}
public class DevicePolicyManager {
diff --git a/api/system-current.txt b/api/system-current.txt
index 63ba05f..026b4b6 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -5792,9 +5792,6 @@ package android.app.admin {
}
public class DeviceInitializerStatus {
- method public static boolean isCustomStatus(int);
- method public static boolean isErrorStatus(int);
- method public static boolean isHighPriority(int);
field public static final int FLAG_STATUS_CUSTOM = 33554432; // 0x2000000
field public static final int FLAG_STATUS_ERROR = 16777216; // 0x1000000
field public static final int FLAG_STATUS_HIGH_PRIORITY = 134217728; // 0x8000000
@@ -5806,9 +5803,9 @@ package android.app.admin {
field public static final int STATUS_ERROR_INSTALL_PACKAGE = 16777240; // 0x1000018
field public static final int STATUS_ERROR_RESET_PROTECTION_BLOCKING_PROVISIONING = 16777238; // 0x1000016
field public static final int STATUS_ERROR_SET_DEVICE_POLICY = 16777241; // 0x1000019
- field public static final int STATUS_STATE_CONNECT_BLUETOOTH_PROXY = 134217736; // 0x8000008
+ field public static final int STATUS_STATE_CONNECTING_BLUETOOTH_PROXY = 134217736; // 0x8000008
field public static final int STATUS_STATE_DEVICE_PROVISIONED = 134217738; // 0x800000a
- field public static final int STATUS_STATE_DISCONNECT_BLUETOOTH_PROXY = 134217737; // 0x8000009
+ field public static final int STATUS_STATE_DISCONNECTING_BLUETOOTH_PROXY = 134217737; // 0x8000009
}
public class DevicePolicyManager {