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

Merge "Carrier Config changes to support IMSI encryption." am: 1caaa514c9 am: e26191a81c

Browse Source 
am: 01741762d8

Change-Id: I385f7ce854a52533251d3777e227aeaf695bb7db
This commit is contained in:
Pankaj Kanwar
2017-06-26 16:03:06 +00:00
committed by android-build-merger
parent 58bcfb7d17 01741762d8
commit 70c1f55927
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1495,6 +1495,23 @@ public class CarrierConfigManager {
public static final String KEY_ROAMING_OPERATOR_STRING_ARRAY =
"roaming_operator_string_array";
/**
* URL from which the proto containing the public key of the Carrier used for
* IMSI encryption will be downloaded.
* @hide
*/
public static final String IMSI_KEY_DOWNLOAD_URL_STRING = "imsi_key_download_url_string";
/**
* Time in days, after which the key will expire, and a new key will need to be downloaded.
* default value is {@link IMSI_ENCRYPTION_DAYS_TIME_DISABLED}, and indicates that IMSI
* encryption is not enabled by default for a carrier. Value of 0 indicates that the key
* does not expire.
* @hide
*/
public static final String IMSI_KEY_EXPIRATION_DAYS_TIME_INT =
"imsi_key_expiration_days_time_int";
/** The default value for every variable. */
private final static PersistableBundle sDefaults;
@@ -1747,6 +1764,8 @@ public class CarrierConfigManager {
sDefaults.putString(IMSI_KEY_DOWNLOAD_URL_STRING, null);
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);
}
/**