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

Commit 6e5ade01 authored by Kevin Chyn's avatar Kevin Chyn Committed by android-build-merger
Browse files

Merge "Add secure setting to cache attention" into qt-dev 

am: 12852fdc

Change-Id: Ia591d7c0a8b50cb72f1c309f5121e7e542d13e6d
parents 508e9aee 12852fdc

core/java/android/provider/Settings.java

+13 −0
Original line number Diff line number Diff line
@@ -8112,6 +8112,16 @@ public final class Settings { 
        private static final Validator FACE_UNLOCK_DISMISSES_KEYGUARD_VALIDATOR =

                BOOLEAN_VALIDATOR;













        /**













         * Whether or not face unlock requires attention. This is a cached value, the source of













         * truth is obtained through the HAL.













         * @hide













         */













        public static final String FACE_UNLOCK_ATTENTION_REQUIRED =













                "face_unlock_attention_required";

























        private static final Validator FACE_UNLOCK_ATTENTION_REQUIRED_VALIDATOR = BOOLEAN_VALIDATOR;



























        /**















         * Whether or not face unlock is allowed for apps (through BiometricPrompt).















         * @hide










@@ -8761,6 +8771,7 @@ public final class Settings {













            AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,















            FACE_UNLOCK_KEYGUARD_ENABLED,















            FACE_UNLOCK_DISMISSES_KEYGUARD,













            FACE_UNLOCK_ATTENTION_REQUIRED,















            FACE_UNLOCK_APP_ENABLED,















            FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,















            ASSIST_GESTURE_ENABLED,










@@ -8927,6 +8938,8 @@ public final class Settings {













            VALIDATORS.put(FACE_UNLOCK_KEYGUARD_ENABLED, FACE_UNLOCK_KEYGUARD_ENABLED_VALIDATOR);















            VALIDATORS.put(FACE_UNLOCK_DISMISSES_KEYGUARD,















                    FACE_UNLOCK_DISMISSES_KEYGUARD_VALIDATOR);













            VALIDATORS.put(FACE_UNLOCK_ATTENTION_REQUIRED,













                    FACE_UNLOCK_ATTENTION_REQUIRED_VALIDATOR);















            VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);















            VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,















                    FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);