Merge "Add Settings key and value for phone switching request source" into main (638f66b1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+30 −0

Original line number	Diff line number	Diff line
		@@ -20191,6 +20191,36 @@ public final class Settings {
		*/
		public static final int PHONE_SWITCHING_STATUS_IN_PROGRESS_MIGRATION_SUCCESS = 11;

		/**
		* Phone switching request source
		* @hide
		*/
		public static final String PHONE_SWITCHING_REQUEST_SOURCE =
		"phone_switching_request_source";

		/**
		* No phone switching request source
		* @hide
		*/
		public static final int PHONE_SWITCHING_REQUEST_SOURCE_NONE = 0;

		/**
		* Phone switching triggered by watch
		* @hide
		*/
		public static final int PHONE_SWITCHING_REQUEST_SOURCE_WATCH = 1;

		/**
		* Phone switching triggered by companion, user confirmation required
		* @hide
		*/
		public static final int PHONE_SWITCHING_REQUEST_SOURCE_COMPANION_USER_CONFIRMATION = 2;

		/**
		* Phone switching triggered by companion, user confirmation not required
		* @hide
		*/
		public static final int PHONE_SWITCHING_REQUEST_SOURCE_COMPANION = 3;

		/**
		* Whether the device has enabled the feature to reduce motion and animation

+5 −0

Original line number	Diff line number	Diff line
		@@ -456,5 +456,10 @@ public class GlobalSettingsValidators {
		VALIDATORS.put(Global.ADD_USERS_WHEN_LOCKED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.REMOVE_GUEST_ON_EXIT, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.USER_SWITCHER_ENABLED, BOOLEAN_VALIDATOR);
		VALIDATORS.put(Global.Wearable.PHONE_SWITCHING_REQUEST_SOURCE,
		new InclusiveIntegerRangeValidator(
		Global.Wearable.PHONE_SWITCHING_REQUEST_SOURCE_NONE,
		Global.Wearable.PHONE_SWITCHING_REQUEST_SOURCE_COMPANION
		));
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -632,7 +632,8 @@ public class SettingsBackupTest {
		Settings.Global.Wearable.WEAR_MEDIA_CONTROLS_PACKAGE,
		Settings.Global.Wearable.WEAR_MEDIA_SESSIONS_PACKAGE,
		Settings.Global.Wearable.WEAR_POWER_ANOMALY_SERVICE_ENABLED,
		Settings.Global.Wearable.CONNECTIVITY_KEEP_DATA_ON);
		Settings.Global.Wearable.CONNECTIVITY_KEEP_DATA_ON,
		Settings.Global.Wearable.PHONE_SWITCHING_REQUEST_SOURCE);

		private static final Set<String> BACKUP_DENY_LIST_SECURE_SETTINGS =
		newHashSet(