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

Commit 891aeaaa authored Nov 01, 2022 by Michał Brzeziński Committed by Android (Google) Code Review Nov 01, 2022

Merge "Revert "Implement SFPS “require screen on to auth”""

parents 0ccf7779 8ce8db38

core/java/android/provider/Settings.java

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -9875,13 +9875,6 @@ public final class Settings {
	public static final String FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME =		public static final String FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME =
	"fingerprint_side_fps_auth_downtime";		"fingerprint_side_fps_auth_downtime";

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

	/**		/**
	* Whether or not debugging is enabled.		* Whether or not debugging is enabled.
	* @hide		* @hide

core/res/res/values/config.xml

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -4945,11 +4945,6 @@
	<!-- If face auth sends the user directly to home/last open app, or stays on keyguard -->		<!-- If face auth sends the user directly to home/last open app, or stays on keyguard -->
	<bool name="config_faceAuthDismissesKeyguard">true</bool>		<bool name="config_faceAuthDismissesKeyguard">true</bool>

	<!-- Default value for whether a SFPS device is required to be
	{@link KeyguardUpdateMonitor#isDeviceInteractive()} for fingerprint auth
	to unlock the device. -->
	<bool name="config_requireScreenOnToAuthEnabled">false</bool>

	<!-- The component name for the default profile supervisor, which can be set as a profile owner		<!-- The component name for the default profile supervisor, which can be set as a profile owner
	even after user setup is complete. The defined component should be used for supervision purposes		even after user setup is complete. The defined component should be used for supervision purposes
	only. The component must be part of a system app. -->		only. The component must be part of a system app. -->

core/res/res/values/symbols.xml

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2725,7 +2725,6 @@
	<java-symbol type="array" name="config_face_acquire_vendor_biometricprompt_ignorelist" />		<java-symbol type="array" name="config_face_acquire_vendor_biometricprompt_ignorelist" />
	<java-symbol type="bool" name="config_faceAuthSupportsSelfIllumination" />		<java-symbol type="bool" name="config_faceAuthSupportsSelfIllumination" />
	<java-symbol type="bool" name="config_faceAuthDismissesKeyguard" />		<java-symbol type="bool" name="config_faceAuthDismissesKeyguard" />
	<java-symbol type="bool" name="config_requireScreenOnToAuthEnabled" />

	<!-- Face config -->		<!-- Face config -->
	<java-symbol type="integer" name="config_faceMaxTemplatesPerUser" />		<java-symbol type="integer" name="config_faceMaxTemplatesPerUser" />

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

+0 −1

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

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

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -177,7 +177,6 @@ public class SecureSettingsValidators {
	VALIDATORS.put(Secure.FINGERPRINT_SIDE_FPS_ENROLL_TAP_WINDOW,		VALIDATORS.put(Secure.FINGERPRINT_SIDE_FPS_ENROLL_TAP_WINDOW,
	NON_NEGATIVE_INTEGER_VALIDATOR);		NON_NEGATIVE_INTEGER_VALIDATOR);
	VALIDATORS.put(Secure.FINGERPRINT_SIDE_FPS_AUTH_DOWNTIME, 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.SHOW_MEDIA_WHEN_BYPASSING, 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_APP_ENABLED, BOOLEAN_VALIDATOR);
	VALIDATORS.put(Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, BOOLEAN_VALIDATOR);		VALIDATORS.put(Secure.FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION, BOOLEAN_VALIDATOR);