Merge "support per carrier based iso country code." am: 79db2b093a (4988e08c) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+28 −14

Original line number	Diff line number	Diff line
		@@ -1154,6 +1154,19 @@ public class CarrierConfigManager {
		*/
		public static final String KEY_CARRIER_NAME_STRING = "carrier_name_string";

		/**
		* String to override sim country iso.
		* Sim country iso is based on sim MCC which is coarse and doesn't work with dual IMSI SIM where
		* a SIM can have multiple MCC from different countries.
		* Instead, each sim carrier should have a single country code, apply per carrier based iso
		* code as an override. The overridden value can be read from
		* {@link TelephonyManager#getSimCountryIso()} and {@link SubscriptionInfo#getCountryIso()}
		*
		* @hide
		*/
		public static final String KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING =
		"sim_country_iso_override_string";

		/**
		* The Component Name of a carrier-provided CallScreeningService implementation. Telecom will
		* bind to {@link android.telecom.CallScreeningService} for ALL incoming calls and provide
		@@ -2495,6 +2508,7 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_CONFIG_WIFI_DISABLE_IN_ECBM, false);
		sDefaults.putBoolean(KEY_CARRIER_NAME_OVERRIDE_BOOL, false);
		sDefaults.putString(KEY_CARRIER_NAME_STRING, "");
		sDefaults.putString(KEY_SIM_COUNTRY_ISO_OVERRIDE_STRING, "");
		sDefaults.putString(KEY_CARRIER_CALL_SCREENING_APP_STRING, "");
		sDefaults.putBoolean(KEY_CDMA_HOME_REGISTERED_PLMN_NAME_OVERRIDE_BOOL, false);
		sDefaults.putString(KEY_CDMA_HOME_REGISTERED_PLMN_NAME_STRING, "");

+7 −0

Original line number	Diff line number	Diff line
		@@ -406,6 +406,13 @@ public class SubscriptionManager {
		*/
		public static final String MNC = "mnc";

		/**
		* TelephonyProvider column name for the iso country code associated with a SIM.
		* <P>Type: TEXT (String)</P>
		* @hide
		*/
		public static final String ISO_COUNTRY_CODE = "iso_country_code";

		/**
		* TelephonyProvider column name for the sim provisioning status associated with a SIM.
		* <P>Type: INTEGER (int)</P>