diff options
author | Benjamin Franz <bfranz@google.com> | 2015-02-12 16:46:50 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 16:46:50 +0000 |
commit | 128b21ec5071cff1c08b270066747638174d3822 (patch) | |
tree | 957623405bd99d0cbb1472fa5bd0042fe1bb3916 /core | |
parent | 75f42173c2ec61f67f788ef5b082a4cb5a2ee377 (diff) | |
parent | c70d0e71c09da0292958d748cedaa5fbacbec74a (diff) | |
download | frameworks_base-128b21ec5071cff1c08b270066747638174d3822.zip frameworks_base-128b21ec5071cff1c08b270066747638174d3822.tar.gz frameworks_base-128b21ec5071cff1c08b270066747638174d3822.tar.bz2 |
am c70d0e71: Fix the javadocs for lock task mode intents.
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
Fix the javadocs for lock task mode intents.
Diffstat (limited to 'core')
-rw-r--r-- | core/java/android/app/admin/DeviceAdminReceiver.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index e9cce51..381d851 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -170,10 +170,10 @@ public class DeviceAdminReceiver extends BroadcastReceiver { * lock task mode from an authorized package. The extra {@link #EXTRA_LOCK_TASK_PACKAGE} * will describe the authorized package using lock task mode. * - * @see DevicePolicyManager#isLockTaskPermitted(String) - * * <p>The calling device admin must be the device owner or profile * owner to receive this broadcast. + * + * @see DevicePolicyManager#isLockTaskPermitted(String) */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_LOCK_TASK_ENTERING @@ -183,20 +183,19 @@ public class DeviceAdminReceiver extends BroadcastReceiver { * Action sent to a device administrator to notify that the device is exiting * lock task mode from an authorized package. * - * @see DevicePolicyManager#isLockTaskPermitted(String) - * * <p>The calling device admin must be the device owner or profile * owner to receive this broadcast. + * + * @see DevicePolicyManager#isLockTaskPermitted(String) */ @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) public static final String ACTION_LOCK_TASK_EXITING = "android.app.action.LOCK_TASK_EXITING"; /** - * A boolean describing whether the device is currently entering or exiting - * lock task mode. + * A string containing the name of the package entering lock task mode. * - * @see #ACTION_LOCK_TASK_CHANGED + * @see #ACTION_LOCK_TASK_ENTERING */ public static final String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE"; |