Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add carrier config for carrier key" am: 11dff58d5e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1556751

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfe871973a34a9ba6eb0512af8f41f4db363335d
This commit is contained in:
Jordan Liu
2021-01-25 19:14:23 +00:00
committed by Automerger Merge Worker
parent e5bf14e7aa 11dff58d5e
commit b24ba046ee
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -2773,6 +2773,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.
@@ -4445,6 +4469,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);

4
telephony/java/android/telephony/ImsiEncryptionInfo.java
View File

@@ -163,8 +163,8 @@ public final class ImsiEncryptionInfo implements Parcelable {
public String toString(){
return "[ImsiEncryptionInfo "
+ "mcc=" + mcc
+ "mnc=" + mnc
+ "publicKey=" + publicKey
+ " mnc=" + mnc
+ " publicKey=" + publicKey
+ ", keyIdentifier=" + keyIdentifier
+ ", keyType=" + keyType
+ ", expirationTime=" + expirationTime