Merge "Define Settings keys to turn off radio stacks when satellite is enabled" into udc-dev (da61e962) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+32 −3

Original line number	Diff line number	Diff line
		@@ -11728,13 +11728,14 @@ public final class Settings {
		public static final String THEATER_MODE_ON = "theater_mode_on";

		/**
		* Constant for use in AIRPLANE_MODE_RADIOS to specify Bluetooth radio.
		* Constant for use in AIRPLANE_MODE_RADIOS or SATELLITE_MODE_RADIOS to specify Bluetooth
		* radio.
		*/
		@Readable
		public static final String RADIO_BLUETOOTH = "bluetooth";

		/**
		* Constant for use in AIRPLANE_MODE_RADIOS to specify Wi-Fi radio.
		* Constant for use in AIRPLANE_MODE_RADIOS or SATELLITE_MODE_RADIOS to specify Wi-Fi radio.
		*/
		@Readable
		public static final String RADIO_WIFI = "wifi";
		@@ -11751,11 +11752,39 @@ public final class Settings {
		public static final String RADIO_CELL = "cell";

		/**
		* Constant for use in AIRPLANE_MODE_RADIOS to specify NFC radio.
		* Constant for use in AIRPLANE_MODE_RADIOS or SATELLITE_MODE_RADIOS to specify NFC radio.
		*/
		@Readable
		public static final String RADIO_NFC = "nfc";

		/**
		* Constant for use in SATELLITE_MODE_RADIOS to specify UWB radio.
		*
		* {@hide}
		*/
		public static final String RADIO_UWB = "uwb";


		/**
		* A comma separated list of radios that need to be disabled when satellite mode is on.
		*
		* {@hide}
		*/
		public static final String SATELLITE_MODE_RADIOS = "satellite_mode_radios";

		/**
		* The satellite mode is enabled for the user. When the satellite mode is enabled, the
		* satellite radio will be turned on and all other radios will be turned off. When the
		* satellite mode is disabled, the satellite radio will be turned off and the states of
		* other radios will be restored.
		* <p>
		* When this setting is set to 0, it means the satellite mode is disabled. When this
		* setting is set to 1, it means the satellite mode is enabled.
		*
		* {@hide}
		*/
		public static final String SATELLITE_MODE_ENABLED = "satellite_mode_enabled";

		/**
		* A comma separated list of radios that need to be disabled when airplane mode
		* is on. This overrides WIFI_ON and BLUETOOTH_ON, if Wi-Fi and bluetooth are

packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,8 @@ public class SettingsBackupTest {
		Settings.Global.ADD_USERS_WHEN_LOCKED,
		Settings.Global.AIRPLANE_MODE_ON,
		Settings.Global.AIRPLANE_MODE_RADIOS,
		Settings.Global.SATELLITE_MODE_RADIOS,
		Settings.Global.SATELLITE_MODE_ENABLED,
		Settings.Global.AIRPLANE_MODE_TOGGLEABLE_RADIOS,
		Settings.Global.ALLOW_USER_SWITCHING_WHEN_SYSTEM_USER_LOCKED,
		Settings.Global.ALWAYS_FINISH_ACTIVITIES,
		@@ -420,6 +422,7 @@ public class SettingsBackupTest {
		Settings.Global.RADIO_NFC,
		Settings.Global.RADIO_WIFI,
		Settings.Global.RADIO_WIMAX,
		Settings.Global.RADIO_UWB,
		Settings.Global.REMOVE_GUEST_ON_EXIT,
		Settings.Global.RECOMMENDED_NETWORK_EVALUATOR_CACHE_EXPIRY_MS,
		Settings.Global.READ_EXTERNAL_STORAGE_ENFORCED_DEFAULT,