Merge "Add carrier config for carrier key" (ac1f0606) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+26 −0

Original line number	Diff line number	Diff line
		@@ -2811,6 +2811,30 @@ public class CarrierConfigManager {
		*/
		public static final String IMSI_KEY_DOWNLOAD_URL_STRING = "imsi_key_download_url_string";

		/**
		* String representation of a carrier's public key used for IMSI encryption for ePDG. If this
		* is provided, the device will use it as a fallback when no key exists on device, but the key
		* download will still initiate.
		* Example string:
		* "-----BEGIN CERTIFICATE-----\nabcde12345abcde12345abcde12345abcde1234
		* 5abcde12345abcde12345\nabcde12345abcde12345abcde12345abcde12345a\n-----END CERTIFICATE-----"
		* @hide
		*/
		public static final String IMSI_CARRIER_PUBLIC_KEY_EPDG_STRING =
		"imsi_carrier_public_key_epdg_string";

		/**
		* String representation of a carrier's public key used for IMSI encryption for WLAN. If this
		* is provided, the device will use it as a fallback when no key exists on device, but the key
		* download will still initiate.
		* Example string:
		* "-----BEGIN CERTIFICATE-----\nabcde12345abcde12345abcde12345abcde1234
		* 5abcde12345abcde12345\nabcde12345abcde12345abcde12345abcde12345a\n-----END CERTIFICATE-----"
		* @hide
		*/
		public static final String IMSI_CARRIER_PUBLIC_KEY_WLAN_STRING =
		"imsi_carrier_public_key_wlan_string";

		/**
		* Identifies if the key is available for WLAN or EPDG or both. The value is a bitmask.
		* 0 indicates that neither EPDG or WLAN is enabled.
		@@ -5015,6 +5039,8 @@ public class CarrierConfigManager {
		sDefaults.putBoolean(KEY_DISABLE_VOICE_BARRING_NOTIFICATION_BOOL, false);
		sDefaults.putInt(IMSI_KEY_AVAILABILITY_INT, 0);
		sDefaults.putString(IMSI_KEY_DOWNLOAD_URL_STRING, null);
		sDefaults.putString(IMSI_CARRIER_PUBLIC_KEY_EPDG_STRING, null);
		sDefaults.putString(IMSI_CARRIER_PUBLIC_KEY_WLAN_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);

telephony/java/android/telephony/ImsiEncryptionInfo.java

+2 −2

File changed.

Contains only whitespace changes.