Merge "Remove unused setting" into qt-r1-dev (709b0a4a) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -8341,16 +8341,6 @@ public final class Settings {
		private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =
		BOOLEAN_VALIDATOR;

		/**
		* Whether or not the face unlock education screen has been shown to the user.
		* @hide
		*/
		public static final String FACE_UNLOCK_EDUCATION_INFO_DISPLAYED =
		"face_unlock_education_info_displayed";

		private static final Validator FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR =
		BOOLEAN_VALIDATOR;

		/**
		* Whether or not debugging is enabled.
		* @hide
		@@ -9190,8 +9180,6 @@ public final class Settings {
		VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);
		VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
		FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);
		VALIDATORS.put(FACE_UNLOCK_EDUCATION_INFO_DISPLAYED,
		FACE_UNLOCK_EDUCATION_INFO_DISPLAYED_VALIDATOR);
		VALIDATORS.put(ASSIST_GESTURE_ENABLED, ASSIST_GESTURE_ENABLED_VALIDATOR);
		VALIDATORS.put(ASSIST_GESTURE_SILENCE_ALERTS_ENABLED,
		ASSIST_GESTURE_SILENCE_ALERTS_ENABLED_VALIDATOR);

+1 −2

Original line number	Diff line number	Diff line
		@@ -720,8 +720,7 @@ public class SettingsBackupTest {
		Settings.Secure.LOCATION_ACCESS_CHECK_DELAY_MILLIS,
		Settings.Secure.BIOMETRIC_DEBUG_ENABLED,
		Settings.Secure.FACE_UNLOCK_ATTENTION_REQUIRED,
		Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED,
		Settings.Secure.FACE_UNLOCK_EDUCATION_INFO_DISPLAYED);
		Settings.Secure.FACE_UNLOCK_DIVERSITY_REQUIRED);

		@Test
		public void systemSettingsBackedUpOrBlacklisted() {