Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 375f7260 authored by Benjamin Franz's avatar Benjamin Franz Committed by android-build-merger
Browse files

Merge "Update Javadoc of setLockTaskEnabled to reflect known issue" into pi-dev 

am: fdef00a5

Change-Id: Ia3a12099b9c87d5fc655a4f0b4afb7b96da674af
parents 1c7d7616 fdef00a5

core/java/android/app/ActivityOptions.java

+2 −1
Original line number Diff line number Diff line
@@ -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.

     *