From 766f4615e98976c03fd78ecd53ce4502b0e4642f Mon Sep 17 00:00:00 2001 From: pkanwar Date: Wed, 31 May 2017 13:10:03 -0700 Subject: [PATCH] Carrier Config changes to support IMSI encryption. Adding 2 config parameters to CarrierConfigManager: 1. imsi_key_download_url. 2. imsi_key_expiration_days_time. BUG: 35606429 Test: manual Change-Id: I191dd0db5fa84a57faea88cb59c2c0b2604064b2 --- .../telephony/CarrierConfigManager.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 17ad77989c8e0..ecfdbaa73556f 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1117,6 +1117,8 @@ public class CarrierConfigManager { /** @hide */ public static final int CDMA_ROAMING_MODE_AFFILIATED = 1; /** @hide */ + public static final int IMSI_ENCRYPTION_DAYS_TIME_DISABLED = -1; + /** @hide */ public static final int CDMA_ROAMING_MODE_ANY = 2; /** * Boolean indicating if support is provided for directly dialing FDN number from FDN list. @@ -1371,6 +1373,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; @@ -1609,6 +1628,8 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_ALWAYS_SHOW_DATA_RAT_ICON_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); } /**