diff options
| author | Kevin Chyn <kchyn@google.com> | 2019-04-05 06:33:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-05 06:33:37 +0000 |
| commit | 12852fdc7d43922cdb866a1b58a16b322bb4ca7e (patch) | |
| tree | a4361e0cce170379663bb7df8b2b9e5ad8cbec81 /core/java | |
| parent | e79cbfd022665a2f23ef72b7d919798a554b01e3 (diff) | |
| parent | b6d2d91f2d28b8be35b649856495f7a9bb994d86 (diff) | |
Merge "Add secure setting to cache attention" into qt-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/provider/Settings.java | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 85feac878c67..ee0c83ea72f8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8113,6 +8113,16 @@ public final class Settings { 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); |