diff options
author | Benjamin Franz <bfranz@google.com> | 2015-02-12 17:02:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 17:02:09 +0000 |
commit | 6076ef9355fec90c40d84abaf2c71345f32badfb (patch) | |
tree | 6dc332db54b853adf04e5fde192e58b8720faafe | |
parent | 00e821a8608efdc19041bdda1e832d3d4b3c29e2 (diff) | |
parent | dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f (diff) | |
download | frameworks_base-6076ef9355fec90c40d84abaf2c71345f32badfb.zip frameworks_base-6076ef9355fec90c40d84abaf2c71345f32badfb.tar.gz frameworks_base-6076ef9355fec90c40d84abaf2c71345f32badfb.tar.bz2 |
am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
* commit 'dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f':
Fix the javadocs for lock task mode intents.
-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"; |