From 1dbc30a4372d0b17c5de4f4b8af8583cb5e77f0f Mon Sep 17 00:00:00 2001 From: Beverly Date: Thu, 28 Apr 2022 14:26:36 +0000 Subject: [PATCH] Add ActiveUnlock Settings Test: manual Bug: 230512326 Change-Id: Idbf2662a822f66947d0fc39a174b72987c100079 --- core/java/android/provider/Settings.java | 20 +++++++++++++++++++ .../settings/backup/SecureSettings.java | 3 +++ .../validators/SecureSettingsValidators.java | 3 +++ 3 files changed, 26 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 34647b144be11..213cb90d4c20c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -9695,6 +9695,26 @@ public final class Settings { @Readable public static final String BIOMETRIC_APP_ENABLED = "biometric_app_enabled"; + /** + * Whether or not active unlock triggers on wake. + * @hide + */ + public static final String ACTIVE_UNLOCK_ON_WAKE = "active_unlock_on_wake"; + + /** + * Whether or not active unlock triggers on unlock intent. + * @hide + */ + public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT = + "active_unlock_on_unlock_intent"; + + /** + * Whether or not active unlock triggers on biometric failure. + * @hide + */ + public static final String ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL = + "active_unlock_on_biometric_fail"; + /** * Whether the assist gesture should be enabled. * diff --git a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java index f949f99673d91..3029781f3e996 100644 --- a/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java +++ b/packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java @@ -117,6 +117,9 @@ public class SecureSettings { Settings.Secure.FACE_UNLOCK_DISMISSES_KEYGUARD, Settings.Secure.FACE_UNLOCK_APP_ENABLED, Settings.Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, + Settings.Secure.ACTIVE_UNLOCK_ON_WAKE, + Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT, + Settings.Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL, Settings.Secure.VR_DISPLAY_MODE, Settings.Secure.NOTIFICATION_BADGING, Settings.Secure.NOTIFICATION_DISMISS_RTL, diff --git a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java index 2bdf819127092..a4da49713f87f 100644 --- a/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java +++ b/packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java @@ -173,6 +173,9 @@ public class SecureSettingsValidators { VALIDATORS.put(Secure.SHOW_MEDIA_WHEN_BYPASSING, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.FACE_UNLOCK_APP_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_WAKE, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT, BOOLEAN_VALIDATOR); + VALIDATORS.put(Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ASSIST_GESTURE_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ASSIST_GESTURE_SILENCE_ALERTS_ENABLED, BOOLEAN_VALIDATOR); VALIDATORS.put(Secure.ASSIST_GESTURE_WAKE_ENABLED, BOOLEAN_VALIDATOR);