diff options
| author | Benjamin Franz <bfranz@google.com> | 2018-02-05 16:36:10 +0000 |
|---|---|---|
| committer | Benjamin Franz <bfranz@google.com> | 2018-02-19 16:47:28 +0000 |
| commit | caffa7789c80108c4f2c230c0a26bd8d8a549ec8 (patch) | |
| tree | 0d3d643e90d6e67a19b907a0d8e601578cf0015a /core/java/android/app/ActivityOptions.java | |
| parent | ee3a2ba97204f7d23c733504991d930aefd9fe7b (diff) | |
Update lock task features name and javadoc
Remove reference to recent and replace by overview. Also throw an IAE
if recents is enabled without home.
Also address API council feedback for ActivityOption.setLockTaskMode
Bug: 72807036
Bug: 72799389
Bug: 71790952
Bug: 71866618
Test: atest FrameworksServicesTests:DevicePolicyManagerTest
Change-Id: I70bed3b46137870e6bf0af5bf7f0846dc51f91ab
Diffstat (limited to 'core/java/android/app/ActivityOptions.java')
| -rw-r--r-- | core/java/android/app/ActivityOptions.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index d5430f05d65b..09dcbf213459 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -164,7 +164,7 @@ public class ActivityOptions { /** * Whether the activity should be launched into LockTask mode. - * @see #setLockTaskMode(boolean) + * @see #setLockTaskEnabled(boolean) */ private static final String KEY_LOCK_TASK_MODE = "android:activity.lockTaskMode"; @@ -1148,7 +1148,7 @@ public class ActivityOptions { * @see Activity#startLockTask() * @see android.app.admin.DevicePolicyManager#setLockTaskPackages(ComponentName, String[]) */ - public ActivityOptions setLockTaskMode(boolean lockTaskMode) { + public ActivityOptions setLockTaskEnabled(boolean lockTaskMode) { mLockTaskMode = lockTaskMode; return this; } |