From 5f9a8e4ab341341df18dd3a60da2326cff9fc3ee Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Fri, 10 Feb 2023 15:45:02 +0000 Subject: [PATCH] Add `KEYGUARD_DISABLE_SHORTCUTS_ALL` constant to DevicePolicyManager KEYGUARD_DISABLE_SHORTCUTS_ALL is a new keyguard restriction that prohibits shortcuts in the keyguard. Bug: 242851438 Test: mp droid. cts-tradefed run commandAndExit cts-dev -m CtsAdminTestCases -t android.admin.cts.DevicePolicyManagerTest#testKeyguardDisabledFeatures Change-Id: I7ad82a76f3a30f4a757f80978b2711e362cba086 --- core/api/current.txt | 1 + core/java/android/app/admin/DevicePolicyManager.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 7c92793c62816..f7e1933f53e17 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -8087,6 +8087,7 @@ package android.app.admin { field @Deprecated public static final int KEYGUARD_DISABLE_REMOTE_INPUT = 64; // 0x40 field public static final int KEYGUARD_DISABLE_SECURE_CAMERA = 2; // 0x2 field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4 + field public static final int KEYGUARD_DISABLE_SHORTCUTS_ALL = 512; // 0x200 field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10 field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8 field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1 diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index e7f6990fb4953..6b8b8e8d2b93d 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -6884,6 +6884,11 @@ public class DevicePolicyManager { */ public static final int KEYGUARD_DISABLE_IRIS = 1 << 8; + /** + * Disable all keyguard shortcuts. + */ + public static final int KEYGUARD_DISABLE_SHORTCUTS_ALL = 1 << 9; + /** * NOTE: Please remember to update the DevicePolicyManagerTest's testKeyguardDisabledFeatures * CTS test when adding to the list above. @@ -6927,7 +6932,8 @@ public class DevicePolicyManager { */ public static final int ORG_OWNED_PROFILE_KEYGUARD_FEATURES_PARENT_ONLY = 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 @@ -8744,7 +8750,8 @@ public class DevicePolicyManager { * {@link #KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS}, * {@link #KEYGUARD_DISABLE_FINGERPRINT}, * {@link #KEYGUARD_DISABLE_FACE}, - * {@link #KEYGUARD_DISABLE_IRIS}. + * {@link #KEYGUARD_DISABLE_IRIS}, + * {@link #KEYGUARD_DISABLE_SHORTCUTS_ALL}. * @throws SecurityException if {@code admin} is not an active administrator or does not user * {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES} */