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

Commit 103b7b48 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "RESTRICT AUTOMERGE Add a hidden `KEYGUARD_DISABLE_SHORTCUTS_ALL`... 

Merge "RESTRICT AUTOMERGE Add a hidden `KEYGUARD_DISABLE_SHORTCUTS_ALL` constant to DevicePolicyManager" into tm-qpr-dev
parents 9d2413c9 a93c333c

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

+9 −1
Original line number Diff line number Diff line
@@ -6637,6 +6637,13 @@ public class DevicePolicyManager { 
     */

    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















     * 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 =















            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