Merge "Add new key EARLY_UPDATE_STATUS to Settings Provider" (3f58fb59) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+31 −0

Original line number	Diff line number	Diff line
		@@ -17762,6 +17762,37 @@ public final class Settings {
		* @hide
		*/
		public static final String CHARGING_SOUNDS_ENABLED = "wear_charging_sounds_enabled";

		/** The status of the early updates process.
		* @hide
		*/
		public static final String EARLY_UPDATES_STATUS = "early_updates_status";

		/**
		* Early updates not started
		* @hide
		*/
		public static final int EARLY_UPDATES_STATUS_NOT_STARTED = 0;
		/**
		* Early updates started and in progress
		* @hide
		*/
		public static final int EARLY_UPDATES_STATUS_STARTED = 1;
		/**
		* Early updates completed and was successful
		* @hide
		*/
		public static final int EARLY_UPDATES_STATUS_SUCCESS = 2;
		/**
		* Early updates skipped
		* @hide
		*/
		public static final int EARLY_UPDATES_STATUS_SKIPPED = 3;
		/**
		* Early updates aborted due to timeout
		* @hide
		*/
		public static final int EARLY_UPDATES_STATUS_ABORTED = 4;
		}
		}

+10 −0

Original line number	Diff line number	Diff line
		@@ -339,6 +339,16 @@ public class GlobalSettingsValidators {
		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(
		new String[] {
		String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_NOT_STARTED),
		String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_STARTED),
		String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SUCCESS),
		String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_SKIPPED),
		String.valueOf(Global.Wearable.EARLY_UPDATES_STATUS_ABORTED),
		}));
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -656,7 +656,8 @@ 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.WEAR_ACTIVITY_AUTO_RESUME_TIMEOUT_MAX_RESET_COUNT,
		Settings.Global.Wearable.EARLY_UPDATES_STATUS);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(