summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorKevin Chyn <kchyn@google.com>2018-07-19 12:41:28 -0700
committerKevin Chyn <kchyn@google.com>2018-07-19 12:41:28 -0700
commitaa580f4edc976578f65bcff602cc1d49720ec098 (patch)
tree396c8f50e23d447aff2f309d502da9c6a7fe02c4 /core/java
parent1b35a86a25752ac61a989a87d126964756d7f038 (diff)
Add secure setting for using face on keyguard
Bug: 111321762 Test: builds Change-Id: I5a2ec8d1d11be2085f2526c9b73a5206b668c8c8
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/provider/Settings.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index ffa5733c6798..848138714e98 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -7510,6 +7510,15 @@ public final class Settings {
public static final String FLASHLIGHT_ENABLED = "flashlight_enabled";
/**
+ * Whether or not face unlock is allowed on Keyguard.
+ * @hide
+ */
+ public static final String FACE_UNLOCK_KEYGUARD_ENABLED = "face_unlock_keyguard_enabled";
+
+ private static final Validator FACE_UNLOCK_KEYGUARD_ENABLED_VALIDATOR =
+ BOOLEAN_VALIDATOR;
+
+ /**
* Whether the assist gesture should be enabled.
*
* @hide
@@ -8005,6 +8014,7 @@ public final class Settings {
DOZE_PULSE_ON_DOUBLE_TAP,
NFC_PAYMENT_DEFAULT_COMPONENT,
AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
+ FACE_UNLOCK_KEYGUARD_ENABLED,
ASSIST_GESTURE_ENABLED,
ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
ASSIST_GESTURE_WAKE_ENABLED,
@@ -8141,6 +8151,7 @@ public final class Settings {
VALIDATORS.put(NFC_PAYMENT_DEFAULT_COMPONENT, NFC_PAYMENT_DEFAULT_COMPONENT_VALIDATOR);
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(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR);
VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);