diff options
| author | Benjamin Franz <bfranz@google.com> | 2015-02-12 19:37:50 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-02-12 19:37:50 +0000 |
| commit | d51584dee7e3f3ca0b872b6f885a4b4d98695f73 (patch) | |
| tree | c1453f0892baef0da1656d600c26f3978711786d | |
| parent | 6f609928cf456f8bb5fed2e1905dc08cbcdaa0a7 (diff) | |
| parent | 6076ef9355fec90c40d84abaf2c71345f32badfb (diff) | |
| download | frameworks_base-d51584dee7e3f3ca0b872b6f885a4b4d98695f73.zip frameworks_base-d51584dee7e3f3ca0b872b6f885a4b4d98695f73.tar.gz frameworks_base-d51584dee7e3f3ca0b872b6f885a4b4d98695f73.tar.bz2 | |
am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
automerge: 6076ef9
* commit '6076ef9355fec90c40d84abaf2c71345f32badfb':
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"; |