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

Merge "RESTRICT AUTOMERGE Add a hidden KEYGUARD_DISABLE_SHORTCUTS_ALL constant to DevicePolicyManager" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-02-15 00:30:35 +00:00
committed by Android (Google) Code Review
parent 9d2413c996 a93c333ccc
commit 103b7b4818
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6637,6 +6637,13 @@ public class DevicePolicyManager {
*/ */
public static final int KEYGUARD_DISABLE_IRIS = 1 << 8; public static final int KEYGUARD_DISABLE_IRIS = 1 << 8;
/**
* Disable all keyguard shortcuts.
*
* @hide
*/
public static final int KEYGUARD_DISABLE_SHORTCUTS_ALL = 1 << 9;
/** /**
* NOTE: Please remember to update the DevicePolicyManagerTest's testKeyguardDisabledFeatures * NOTE: Please remember to update the DevicePolicyManagerTest's testKeyguardDisabledFeatures
* CTS test when adding to the list above. * CTS test when adding to the list above.
@@ -6680,7 +6687,8 @@ public class DevicePolicyManager {
*/ */
public static final int ORG_OWNED_PROFILE_KEYGUARD_FEATURES_PARENT_ONLY = public static final int ORG_OWNED_PROFILE_KEYGUARD_FEATURES_PARENT_ONLY =
DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA DevicePolicyManager.KEYGUARD_DISABLE_SECURE_CAMERA
| DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS; | DevicePolicyManager.KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
| DevicePolicyManager.KEYGUARD_DISABLE_SHORTCUTS_ALL;
/** /**
* Keyguard features that when set on a normal or organization-owned managed profile, have * Keyguard features that when set on a normal or organization-owned managed profile, have