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

Commit fdef00a5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents deea3b84 11f05822

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.

     *