Merge "Remove unused setting WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT" (c3936d91) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+1 −8

Original line number	Diff line number	Diff line
		@@ -17697,14 +17697,6 @@ public final class Settings {
		public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_SET_BY_USER =
		"wear_activity_auto_resume_timeout_set_by_user";

		/**
		* The maximum times that we are allowed to reset the activity auto-resume timeout
		* timer.
		* @hide
		*/
		public static final String WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT =
		"wear_activity_auto_resume_timeout_max_reset_count";

		/**
		* If burn in protection is enabled.
		* @hide
		@@ -17712,6 +17704,7 @@ public final class Settings {
		public static final String BURN_IN_PROTECTION_ENABLED = "burn_in_protection";

		/**

		* Whether the device has combined location setting enabled.
		* @hide
		*/

+0 −3

Original line number	Diff line number	Diff line
		@@ -336,9 +336,6 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.CHARGING_SOUNDS_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.BEDTIME_MODE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(
		Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT,
		NON_NEGATIVE_INTEGER_VALIDATOR);
		VALIDATORS.put(
		Global.Wearable.EARLY_UPDATES_STATUS,
		new DiscreteValueValidator(

+0 −1

Original line number	Diff line number	Diff line
		@@ -657,7 +657,6 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.CHARGING_SOUNDS_ENABLED,
		Settings.Global.Wearable.SCREEN_UNLOCK_SOUND_ENABLED,
		Settings.Global.Wearable.BEDTIME_MODE,
		Settings.Global.Wearable.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT,
		Settings.Global.Wearable.EARLY_UPDATES_STATUS);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =