From 11f058225f1f4e1ea75cb77a0d964ba1e9578a40 Mon Sep 17 00:00:00 2001 From: Benjamin Franz Date: Thu, 29 Mar 2018 15:40:06 +0100 Subject: Update Javadoc of setLockTaskEnabled to reflect known issue Document the known issue that setLockTaskEnabled does not take effect if the activity is already in the foreground or running in the background. Bug: 72806000 Test: make docs Change-Id: I2b571cee553dbc8a11147ebe4d444e5f69ce96b2 --- core/java/android/app/ActivityOptions.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index 09dcbf213459..ecd99a7b5402 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -1139,7 +1139,8 @@ public class ActivityOptions { * {@link android.app.admin.DevicePolicyManager} can run in LockTask mode. Therefore, if * {@link android.app.admin.DevicePolicyManager#isLockTaskPermitted(String)} returns * {@code false} for the package of the target activity, a {@link SecurityException} will be - * thrown during {@link Context#startActivity(Intent, Bundle)}. + * thrown during {@link Context#startActivity(Intent, Bundle)}. This method doesn't affect + * activities that are already running — relaunch the activity to run in lock task mode. * * Defaults to {@code false} if not set. * -- cgit v1.2.3-59-g8ed1b