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

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

Browse Source 
am: fdef00a5ae

Change-Id: Ia3a12099b9c87d5fc655a4f0b4afb7b96da674af
This commit is contained in:
Benjamin Franz
2018-04-09 06:53:42 -07:00
committed by android-build-merger
parent 1c7d761692 fdef00a5ae
commit 375f7260c4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ActivityOptions.java
View File

@@ -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.
*