diff options
| author | Nicolas Prevot <nprevot@google.com> | 2015-07-27 18:15:20 +0100 |
|---|---|---|
| committer | Nicolas Prevot <nprevot@google.com> | 2015-07-28 21:11:27 +0100 |
| commit | 00799008832e11f06f9ddc0bf721799edee99f28 (patch) | |
| tree | 1ef2e4ca5f93f0b2e6d9335a0c814ca3e41d3a3e /core | |
| parent | a7bdace2627cb4cd55ac7c182d9e093b3a1ffb7b (diff) | |
| download | frameworks_base-00799008832e11f06f9ddc0bf721799edee99f28.zip frameworks_base-00799008832e11f06f9ddc0bf721799edee99f28.tar.gz frameworks_base-00799008832e11f06f9ddc0bf721799edee99f28.tar.bz2 | |
Send a public broadcast when the device owner is set.
Make it a protected broadcast.
BUG: 22623518
Change-Id: Ia36e8f0b80a6301d7d8e0461476842c78762b5e8
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 12 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 1 |
2 files changed, 12 insertions, 1 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 33cbc9d..b2b1727 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -690,7 +690,7 @@ public class DevicePolicyManager { = "android.app.extra.PROFILE_OWNER_NAME"; /** - * Activity action: send when any policy admin changes a policy. + * Broadcast action: send when any policy admin changes a policy. * This is generally used to find out when a new policy is in effect. * * @hide @@ -699,6 +699,16 @@ public class DevicePolicyManager { = "android.app.action.DEVICE_POLICY_MANAGER_STATE_CHANGED"; /** + * Broadcast action: sent when the device owner is set or changed. + * + * This broadcast is sent only to the primary user. + * @see #ACTION_PROVISION_MANAGED_DEVICE + */ + @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) + public static final String ACTION_DEVICE_OWNER_CHANGED + = "android.app.action.DEVICE_OWNER_CHANGED"; + + /** * The ComponentName of the administrator component. * * @see #ACTION_ADD_DEVICE_ADMIN diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 3e22e09..1f49929 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -319,6 +319,7 @@ <protected-broadcast android:name="android.internal.policy.action.BURN_IN_PROTECTION" /> <protected-broadcast android:name="android.app.action.SYSTEM_UPDATE_POLICY_CHANGED" /> + <protected-broadcast android:name="android.app.action.DEVICE_OWNER_CHANGED" /> <!-- ====================================================================== --> <!-- RUNTIME PERMISSIONS --> <!-- ====================================================================== --> |