diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-05-08 22:12:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 22:12:58 +0000 |
| commit | ed1ef7d4eb8934f6940a2e828ebd0e6878e1af89 (patch) | |
| tree | 5674ff0091bcc59312f42902273658d3c2a147ad /api | |
| parent | e239f782509583b14c95b1c88bf2b085d1e1b6e1 (diff) | |
| parent | 9ef04bfb0711d54fc951ca79d38c4d14a0cc817a (diff) | |
| download | frameworks_base-ed1ef7d4eb8934f6940a2e828ebd0e6878e1af89.zip frameworks_base-ed1ef7d4eb8934f6940a2e828ebd0e6878e1af89.tar.gz frameworks_base-ed1ef7d4eb8934f6940a2e828ebd0e6878e1af89.tar.bz2 | |
Merge "DeviceInitializerStatus API review changes" into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 7 | ||||
| -rw-r--r-- | api/system-current.txt | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/api/current.txt b/api/current.txt index 6e520b8..f1865d5 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5695,9 +5695,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 @@ -5709,9 +5706,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 7445805..aacb9a0 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5791,9 +5791,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 @@ -5805,9 +5802,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 { |