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

Commit c04f9bd8 authored Jan 11, 2023 by Joshua Mccloskey Committed by Automerger Merge Worker Jan 11, 2023

Merge "Added performant auth setting for fingeprint" into tm-qpr-dev am: 410dd6e9

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20932577

Change-Id: I639cff4e93f0e21cd0bec55eef13184f9844503c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents dad043a2 410dd6e9

core/java/android/provider/Settings.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -9819,11 +9819,10 @@ public final class Settings {
		"fingerprint_side_fps_auth_downtime";

		/**
		* Whether or not a SFPS device is required to be interactive for auth to unlock the device.
		* Whether or not a SFPS device is enabling the performant auth setting.
		* @hide
		*/
		public static final String SFPS_REQUIRE_SCREEN_ON_TO_AUTH_ENABLED =
		"sfps_require_screen_on_to_auth_enabled";
		public static final String SFPS_PERFORMANT_AUTH_ENABLED = "sfps_performant_auth_enabled";

		/**
		* Whether or not debugging is enabled.

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ public class SecureSettings {
		Settings.Secure.FINGERPRINT_SIDE_FPS_BP_POWER_WINDOW,
		Settings.Secure.FINGERPRINT_SIDE_FPS_ENROLL_TAP_WINDOW,
		Settings.Secure.FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME,
		Settings.Secure.SFPS_REQUIRE_SCREEN_ON_TO_AUTH_ENABLED,
		Settings.Secure.SFPS_PERFORMANT_AUTH_ENABLED,
		Settings.Secure.ACTIVE_UNLOCK_ON_WAKE,
		Settings.Secure.ACTIVE_UNLOCK_ON_UNLOCK_INTENT,
		Settings.Secure.ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL,

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,7 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.FINGERPRINT_SIDE_FPS_ENROLL_TAP_WINDOW,
		NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME, NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(Secure.SFPS_REQUIRE_SCREEN_ON_TO_AUTH_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Secure.SFPS_PERFORMANT_AUTH_ENABLED, BOOLEAN_VALIDATOR);
		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);