Merge "[DO NOT MERGE] Add country blacklist support" into qt-qpr1-dev (7fd29af1) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+24 −2

Original line number	Diff line number	Diff line
		@@ -9900,13 +9900,34 @@ public final class Settings {
		* List of ISO country codes in which eUICC UI is shown. Country codes should be separated
		* by comma.
		*
		* <p>Used to hide eUICC UI from users who are currently in countries no carriers support
		* eUICC.
		* Note: if {@link #EUICC_SUPPORTED_COUNTRIES} is empty, then {@link
		* #EUICC_UNSUPPORTED_COUNTRIES} is used.
		*
		* <p>Used to hide eUICC UI from users who are currently in countries where no carriers
		* support eUICC.
		*
		* @hide
		*/
		//TODO(b/77914569) Changes this to System Api.
		public static final String EUICC_SUPPORTED_COUNTRIES = "euicc_supported_countries";

		/**
		* List of ISO country codes in which eUICC UI is not shown. Country codes should be
		* separated by comma.
		*
		* Note: if {@link #EUICC_SUPPORTED_COUNTRIES} is empty, then {@link
		* #EUICC_UNSUPPORTED_COUNTRIES} is used.
		*
		* <p>Used to hide eUICC UI from users who are currently in countries where no carriers
		* support eUICC.
		*
		* @hide
		*/
		//TODO(b/77914569) Changes this to System Api.
		public static final String EUICC_UNSUPPORTED_COUNTRIES = "euicc_unsupported_countries";
		private static final Validator EUICC_UNSUPPORTED_COUNTRIES_VALIDATOR =
		new SettingsValidators.ComponentNameListValidator(",");

		/**
		* Whether any activity can be resized. When this is true, any
		* activity, regardless of manifest values, can be resized for multi-window.
		@@ -13969,6 +13990,7 @@ public final class Settings {
		VALIDATORS.put(DYNAMIC_POWER_SAVINGS_DISABLE_THRESHOLD,
		DYNAMIC_POWER_SAVINGS_VALIDATOR);
		VALIDATORS.put(BLUETOOTH_ON, BLUETOOTH_ON_VALIDATOR);
		VALIDATORS.put(EUICC_UNSUPPORTED_COUNTRIES, EUICC_UNSUPPORTED_COUNTRIES_VALIDATOR);
		VALIDATORS.put(PRIVATE_DNS_MODE, PRIVATE_DNS_MODE_VALIDATOR);
		VALIDATORS.put(PRIVATE_DNS_SPECIFIER, PRIVATE_DNS_SPECIFIER_VALIDATOR);
		VALIDATORS.put(SOFT_AP_TIMEOUT_ENABLED, SOFT_AP_TIMEOUT_ENABLED_VALIDATOR);

core/proto/android/providers/settings/global.proto

+1 −0

Original line number	Diff line number	Diff line
		@@ -385,6 +385,7 @@ message GlobalSettingsProto {

		optional SettingProto provisioned = 1 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto factory_reset_timeout_millis = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];
		optional SettingProto unsupported_countries = 3 [ (android.privacy).dest = DEST_AUTOMATIC ];
		}
		optional Euicc euicc = 52;

packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -641,6 +641,9 @@ class SettingsProtoDumpUtil {
		dumpSetting(s, p,
		Settings.Global.EUICC_FACTORY_RESET_TIMEOUT_MILLIS,
		GlobalSettingsProto.Euicc.FACTORY_RESET_TIMEOUT_MILLIS);
		dumpSetting(s, p,
		Settings.Global.EUICC_UNSUPPORTED_COUNTRIES,
		GlobalSettingsProto.Euicc.UNSUPPORTED_COUNTRIES);
		p.end(euiccToken);

		dumpSetting(s, p,