diff options
| author | Jessica Hummel <jhummel@google.com> | 2014-03-10 09:29:24 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-03-10 09:29:25 +0000 |
| commit | df897d08cebb013795ae679eef842a38b5153252 (patch) | |
| tree | 5ad75cbed1126d2b15d97318308c3a723f3ec1ca /api | |
| parent | 30c86ad4754e228ecc0ff07ecb3d76ea37a619e0 (diff) | |
| parent | 8cdb6fcd9b6a53978cb2b2ad9ab668ae19392266 (diff) | |
| download | frameworks_base-df897d08cebb013795ae679eef842a38b5153252.zip frameworks_base-df897d08cebb013795ae679eef842a38b5153252.tar.gz frameworks_base-df897d08cebb013795ae679eef842a38b5153252.tar.bz2 | |
Merge "Extend DeviceAdminReceiver to receive provisioning complete broadcast."
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 754a84f..83f3300 100644 --- a/api/current.txt +++ b/api/current.txt @@ -4727,6 +4727,7 @@ package android.app.admin { method public void onPasswordExpiring(android.content.Context, android.content.Intent); method public void onPasswordFailed(android.content.Context, android.content.Intent); method public void onPasswordSucceeded(android.content.Context, android.content.Intent); + method public void onProfileProvisioningComplete(android.content.Context, android.content.Intent); method public void onReceive(android.content.Context, android.content.Intent); field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLED = "android.app.action.DEVICE_ADMIN_DISABLED"; field public static final java.lang.String ACTION_DEVICE_ADMIN_DISABLE_REQUESTED = "android.app.action.DEVICE_ADMIN_DISABLE_REQUESTED"; @@ -4735,6 +4736,7 @@ package android.app.admin { field public static final java.lang.String ACTION_PASSWORD_EXPIRING = "android.app.action.ACTION_PASSWORD_EXPIRING"; field public static final java.lang.String ACTION_PASSWORD_FAILED = "android.app.action.ACTION_PASSWORD_FAILED"; field public static final java.lang.String ACTION_PASSWORD_SUCCEEDED = "android.app.action.ACTION_PASSWORD_SUCCEEDED"; + field public static final java.lang.String ACTION_PROVISIONING_COMPLETE = "android.managedprovisioning.ACTION_PROVISIONING_COMPLETE"; field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin"; field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING"; } |