Merge "Remove redundant settings." (1d8b5a56) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −16

Original line number	Diff line number	Diff line
		@@ -15079,22 +15079,6 @@ public final class Settings {
		public static final String MAX_SOUND_TRIGGER_DETECTION_SERVICE_OPS_PER_DAY =
		"max_sound_trigger_detection_service_ops_per_day";

		/**
		* Setting indicating the name of the Wear OS app package containing the device's sysui.
		*
		* @hide
		*/
		public static final String CLOCKWORK_SYSUI_PACKAGE_NAME =
		"clockwork_sysui_package_name";

		/**
		* Setting indicating the name of the main activity of the Wear OS sysui.
		*
		* @hide
		*/
		public static final String CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME =
		"clockwork_sysui_main_activity_name";

		/**
		* Setting to determine if the Clockwork Home application is ready.
		*

+0 −3

Original line number	Diff line number	Diff line
		@@ -40,9 +40,6 @@ public class GlobalSettings {
		public static final String[] SETTINGS_TO_BACKUP = {
		Settings.Global.APPLY_RAMPING_RINGER,
		Settings.Global.BUGREPORT_IN_POWER_MENU,
		Settings.Global.CLOCKWORK_SYSUI_PACKAGE_NAME,
		Settings.Global.CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME,
		Settings.Global.CLOCKWORK_HOME_READY,
		Settings.Global.STAY_ON_WHILE_PLUGGED_IN,
		Settings.Global.APP_AUTO_RESTRICTION_ENABLED,
		Settings.Global.AUTO_TIME,

+0 −2

Original line number	Diff line number	Diff line
		@@ -116,8 +116,6 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(
		Global.DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD, PERCENTAGE_INTEGER_VALIDATOR);
		VALIDATORS.put(Global.BLUETOOTH_ON, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.CLOCKWORK_SYSUI_MAIN_ACTIVITY_NAME, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Global.CLOCKWORK_SYSUI_PACKAGE_NAME, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Global.CLOCKWORK_HOME_READY, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Global.ENABLE_TARE, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.ENABLE_TARE_ALARM_MANAGER, BOOLEAN_VALIDATOR);

+1 −0

Original line number	Diff line number	Diff line
		@@ -591,6 +591,7 @@ public class SettingsBackupTest {
		Settings.Global.CACHED_APPS_FREEZER_ENABLED,
		Settings.Global.APP_INTEGRITY_VERIFICATION_TIMEOUT,
		Settings.Global.KEY_CHORD_POWER_VOLUME_UP,
		Settings.Global.CLOCKWORK_HOME_READY,
		Settings.Global.Wearable.BATTERY_SAVER_MODE,
		Settings.Global.Wearable.COMBINED_LOCATION_ENABLED,
		Settings.Global.Wearable.HAS_PAY_TOKENS,