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

Merge "Intercepting activites that could cause lock task mode violation in ActivityStartInterceptor."

Browse Source
This commit is contained in:
Yuhan Zhao
2020-02-05 07:42:49 +00:00
committed by Android (Google) Code Review
parent 0496ee9a9d f3b3d41560
commit be5015b00a
11 changed files with 239 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -2089,6 +2089,13 @@ public class DevicePolicyManager {
*/
public static final int LOCK_TASK_FEATURE_KEYGUARD = 1 << 5;
/**
* Enable blocking of non-whitelisted activities from being started into a locked task.
*
* @see #setLockTaskFeatures(ComponentName, int)
*/
public static final int LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK = 1 << 6;
/**
* Flags supplied to {@link #setLockTaskFeatures(ComponentName, int)}.
*
@@ -2102,7 +2109,8 @@ public class DevicePolicyManager {
LOCK_TASK_FEATURE_HOME,
LOCK_TASK_FEATURE_OVERVIEW,
LOCK_TASK_FEATURE_GLOBAL_ACTIONS,
LOCK_TASK_FEATURE_KEYGUARD
LOCK_TASK_FEATURE_KEYGUARD,
LOCK_TASK_FEATURE_BLOCK_ACTIVITY_START_IN_TASK
})
public @interface LockTaskFeature {}