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

Commit 5f9a8e4a authored by Steven Ng's avatar Steven Ng
Browse files

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
parent 44920b1c

core/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -8087,6 +8087,7 @@ package android.app.admin { 
    field @Deprecated public static final int KEYGUARD_DISABLE_REMOTE_INPUT = 64; // 0x40

    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_CAMERA = 2; // 0x2

    field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4

    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_TRUST_AGENTS = 16; // 0x10

    field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8

    field public static final int KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS = 8; // 0x8

    field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1

    field public static final int KEYGUARD_DISABLE_WIDGETS_ALL = 1; // 0x1

core/java/android/app/admin/DevicePolicyManager.java

+9 −2
Original line number Original line Diff line number Diff line
@@ -6884,6 +6884,11 @@ 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.














     */














    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.










@@ -6927,7 +6932,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










@@ -8744,7 +8750,8 @@ public class DevicePolicyManager {









     *            {@link #KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS},







     *            {@link #KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS},











     *            {@link #KEYGUARD_DISABLE_FINGERPRINT},







     *            {@link #KEYGUARD_DISABLE_FINGERPRINT},











     *            {@link #KEYGUARD_DISABLE_FACE},







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







     * @throws SecurityException if {@code admin} is not an active administrator or does not user











     *             {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES}







     *             {@link DeviceAdminInfo#USES_POLICY_DISABLE_KEYGUARD_FEATURES}











     */







     */