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

Commit 81a91f76 authored by Steven Ng's avatar Steven Ng Committed by Automerger Merge Worker
Browse files

RESTRICT AUTOMERGE Add a hidden `KEYGUARD_DISABLE_SHORTCUTS_ALL` constant to... 

RESTRICT AUTOMERGE Add a hidden `KEYGUARD_DISABLE_SHORTCUTS_ALL` constant to DevicePolicyManager am: a93c333c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21408392



Change-Id: I42fd2a74a15daea438dc352a5eeefdb758b0d84a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7756f3d7 a93c333c

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

+9 −1
Original line number Diff line number Diff line
@@ -6639,6 +6639,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.








@@ -6682,7 +6689,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