diff options
| author | Nicolas Prévot <nprevot@google.com> | 2015-07-29 16:59:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-29 16:59:46 +0000 |
| commit | 64ac302f0c10de0016689b234ba01c1c81da0061 (patch) | |
| tree | 8f20b920f8ce548b060f8a7bbc3515ad6fd0bdca /api | |
| parent | 1bd310e18c50d4fd81207a3e2fe61cc694ee7607 (diff) | |
| parent | 00799008832e11f06f9ddc0bf721799edee99f28 (diff) | |
| download | frameworks_base-64ac302f0c10de0016689b234ba01c1c81da0061.zip frameworks_base-64ac302f0c10de0016689b234ba01c1c81da0061.tar.gz frameworks_base-64ac302f0c10de0016689b234ba01c1c81da0061.tar.bz2 | |
Merge "Send a public broadcast when the device owner is set." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 06b9494..df72adf 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5697,6 +5697,7 @@ package android.app.admin { method public void uninstallCaCert(android.content.ComponentName, byte[]); method public void wipeData(int); field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN"; + field public static final java.lang.String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED"; field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED"; field public static final java.lang.String ACTION_PROVISION_MANAGED_DEVICE = "android.app.action.PROVISION_MANAGED_DEVICE"; field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.PROVISION_MANAGED_PROFILE"; diff --git a/api/system-current.txt b/api/system-current.txt index 83c3beb..319aa9f 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5829,6 +5829,7 @@ package android.app.admin { method public void uninstallCaCert(android.content.ComponentName, byte[]); method public void wipeData(int); field public static final java.lang.String ACTION_ADD_DEVICE_ADMIN = "android.app.action.ADD_DEVICE_ADMIN"; + field public static final java.lang.String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED"; field public static final java.lang.String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED"; field public static final java.lang.String ACTION_PROVISION_MANAGED_DEVICE = "android.app.action.PROVISION_MANAGED_DEVICE"; field public static final java.lang.String ACTION_PROVISION_MANAGED_PROFILE = "android.app.action.PROVISION_MANAGED_PROFILE"; |