diff options
| author | Craig Lafayette <craiglafa@google.com> | 2015-06-11 17:45:01 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-11 17:45:03 +0000 |
| commit | 77b2d49abb38fafb91fb99ce603a92f189553cd7 (patch) | |
| tree | 9ab9113e7816b4200edcef860cb74e805a669d4b /api/current.txt | |
| parent | 96d7058aaaf58a0c6a2bfb296c5950b2e7e37d37 (diff) | |
| parent | 240e64828f68064b2a1074a1dda1fc41fe19d711 (diff) | |
| download | frameworks_base-77b2d49abb38fafb91fb99ce603a92f189553cd7.zip frameworks_base-77b2d49abb38fafb91fb99ce603a92f189553cd7.tar.gz frameworks_base-77b2d49abb38fafb91fb99ce603a92f189553cd7.tar.bz2 | |
Merge "Remove device initializer status messages" into mnc-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/api/current.txt b/api/current.txt index 567b172..cfb9398 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5681,23 +5681,6 @@ package android.app.admin { field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE"; } - public class DeviceInitializerStatus { - 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 - field public static final int FLAG_STATUS_RESERVED = 67108864; // 0x4000000 - field public static final int STATUS_ERROR_CONNECT_WIFI = 16777237; // 0x1000015 - field public static final int STATUS_ERROR_DELETE_APPS = 16777242; // 0x100001a - field public static final int STATUS_ERROR_DOUBLE_BUMP = 16777246; // 0x100001e - field public static final int STATUS_ERROR_DOWNLOAD_PACKAGE = 16777239; // 0x1000017 - 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_CONNECTING_BLUETOOTH_PROXY = 134217736; // 0x8000008 - field public static final int STATUS_STATE_DEVICE_PROVISIONED = 134217738; // 0x800000a - field public static final int STATUS_STATE_DISCONNECTING_BLUETOOTH_PROXY = 134217737; // 0x8000009 - } - public class DevicePolicyManager { method public void addCrossProfileIntentFilter(android.content.ComponentName, android.content.IntentFilter, int); method public boolean addCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String); @@ -5765,7 +5748,6 @@ package android.app.admin { method public boolean removeCrossProfileWidgetProvider(android.content.ComponentName, java.lang.String); method public boolean removeUser(android.content.ComponentName, android.os.UserHandle); method public boolean resetPassword(java.lang.String, int); - method public void sendDeviceInitializerStatus(int, java.lang.String); method public void setAccountManagementDisabled(android.content.ComponentName, java.lang.String, boolean); method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean); method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle); @@ -5829,10 +5811,6 @@ package android.app.admin { field public static final java.lang.String EXTRA_DEVICE_ADMIN = "android.app.extra.DEVICE_ADMIN"; field public static final java.lang.String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE"; field public static final java.lang.String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE = "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE"; - field public static final java.lang.String EXTRA_PROVISIONING_BT_DEVICE_ID = "android.app.extra.PROVISIONING_BT_DEVICE_ID"; - field public static final java.lang.String EXTRA_PROVISIONING_BT_MAC_ADDRESS = "android.app.extra.PROVISIONING_BT_MAC_ADDRESS"; - field public static final java.lang.String EXTRA_PROVISIONING_BT_USE_PROXY = "android.app.extra.PROVISIONING_BT_USE_PROXY"; - field public static final java.lang.String EXTRA_PROVISIONING_BT_UUID = "android.app.extra.PROVISIONING_BT_UUID"; field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_CERTIFICATE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_CERTIFICATE_CHECKSUM"; field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME"; field public static final java.lang.String EXTRA_PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE = "android.app.extra.PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE"; |