diff options
| author | Lucas Dupin <dupin@google.com> | 2019-03-08 17:12:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-03-08 17:12:04 +0000 |
| commit | c5c616455b98606d68989a9f63c56069d8efe040 (patch) | |
| tree | 48eadf6fff6e844bfbb5ab380b8260c9a461e602 /core/java/android | |
| parent | e80f6774dc40db19d7f291f7696a6d47df80cc29 (diff) | |
| parent | c94963fd907a87634eef534dc979fca70a7d8dba (diff) | |
Merge "Setting to bypass lock screen upon face unlock"
Diffstat (limited to 'core/java/android')
| -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 ecbd673a0981..2b9dff299b84 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -8011,6 +8011,16 @@ public final class Settings { BOOLEAN_VALIDATOR; /** + * Whether or not face unlock dismisses the keyguard. + * @hide + */ + public static final String FACE_UNLOCK_DISMISSES_KEYGUARD = + "face_unlock_dismisses_keyguard"; + + private static final Validator FACE_UNLOCK_DISMISSES_KEYGUARD_VALIDATOR = + BOOLEAN_VALIDATOR; + + /** * Whether or not face unlock is allowed for apps (through BiometricPrompt). * @hide */ @@ -8684,6 +8694,7 @@ public final class Settings { NFC_PAYMENT_DEFAULT_COMPONENT, AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN, FACE_UNLOCK_KEYGUARD_ENABLED, + FACE_UNLOCK_DISMISSES_KEYGUARD, FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, ASSIST_GESTURE_ENABLED, @@ -8845,6 +8856,8 @@ public final class Settings { VALIDATORS.put(AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN, AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN_VALIDATOR); 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_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR); VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR); |