Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c70d0e71: Fix the javadocs for lock task mode intents.

Browse Source 
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
  Fix the javadocs for lock task mode intents.
This commit is contained in:
Benjamin Franz
2015-02-12 16:45:06 +00:00
committed by Android Git Automerger
parent 4fa3a80b6c c70d0e71c0
commit 40ab8bb229
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/java/android/app/admin/DeviceAdminReceiver.java
View File

@@ -170,10 +170,10 @@ public class DeviceAdminReceiver extends BroadcastReceiver {
* lock task mode from an authorized package. The extra {@link #EXTRA_LOCK_TASK_PACKAGE} * lock task mode from an authorized package. The extra {@link #EXTRA_LOCK_TASK_PACKAGE}
* will describe the authorized package using lock task mode. * 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 * <p>The calling device admin must be the device owner or profile
* owner to receive this broadcast. * owner to receive this broadcast.
*
* @see DevicePolicyManager#isLockTaskPermitted(String)
*/ */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_LOCK_TASK_ENTERING 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 * Action sent to a device administrator to notify that the device is exiting
* lock task mode from an authorized package. * lock task mode from an authorized package.
* *
* @see DevicePolicyManager#isLockTaskPermitted(String)
*
* <p>The calling device admin must be the device owner or profile * <p>The calling device admin must be the device owner or profile
* owner to receive this broadcast. * owner to receive this broadcast.
*
* @see DevicePolicyManager#isLockTaskPermitted(String)
*/ */
@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION) @SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
public static final String ACTION_LOCK_TASK_EXITING public static final String ACTION_LOCK_TASK_EXITING
= "android.app.action.LOCK_TASK_EXITING"; = "android.app.action.LOCK_TASK_EXITING";
/** /**
* A boolean describing whether the device is currently entering or exiting * A string containing the name of the package entering lock task mode.
* lock task mode.
* *
* @see #ACTION_LOCK_TASK_CHANGED * @see #ACTION_LOCK_TASK_ENTERING
*/ */
public static final String EXTRA_LOCK_TASK_PACKAGE = public static final String EXTRA_LOCK_TASK_PACKAGE =
"android.app.extra.LOCK_TASK_PACKAGE"; "android.app.extra.LOCK_TASK_PACKAGE";