Merge "Convert CDMA caller ID codes while roaming on 3GPP networks" (f9dd150e) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+13 −2

Original line number	Diff line number	Diff line
		@@ -1495,6 +1495,17 @@ public class CarrierConfigManager {
		public static final String IMSI_KEY_EXPIRATION_DAYS_TIME_INT =
		"imsi_key_expiration_days_time_int";

		/**
		* Key identifying if the CDMA Caller ID presentation and suppression MMI codes
		* should be converted to 3GPP CLIR codes when a multimode (CDMA+UMTS+LTE) device is roaming
		* on a 3GPP network. Specifically *67<number> will be converted to #31#<number> and
		* 82<number> will be converted to 31#<number> before dialing a call when this key is
		* set TRUE and device is roaming on a 3GPP network.
		* @hide
		*/
		public static final String KEY_CONVERT_CDMA_CALLER_ID_MMI_CODES_WHILE_ROAMING_ON_3GPP_BOOL =
		"convert_cdma_caller_id_mmi_codes_while_roaming_on_3gpp_bool";

		/** The default value for every variable. */
		private final static PersistableBundle sDefaults;

		@@ -1745,10 +1756,10 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL, false);
		sDefaults.putInt(IMSI_KEY_EXPIRATION_DAYS_TIME_INT, IMSI_ENCRYPTION_DAYS_TIME_DISABLED);
		sDefaults.putString(IMSI_KEY_DOWNLOAD_URL_STRING, null);
		sDefaults.putBoolean(KEY_CONVERT_CDMA_CALLER_ID_MMI_CODES_WHILE_ROAMING_ON_3GPP_BOOL,
		false);
		sDefaults.putStringArray(KEY_NON_ROAMING_OPERATOR_STRING_ARRAY, null);
		sDefaults.putStringArray(KEY_ROAMING_OPERATOR_STRING_ARRAY, null);
		sDefaults.putInt(IMSI_KEY_EXPIRATION_DAYS_TIME_INT, IMSI_ENCRYPTION_DAYS_TIME_DISABLED);
		sDefaults.putString(IMSI_KEY_DOWNLOAD_URL_STRING, null);
		}

		/**