From 0a5b207bb49d8d5d1aa81430839e3ba61beb0e07 Mon Sep 17 00:00:00 2001 From: Hai Shalom Date: Thu, 26 Dec 2019 16:17:00 -0800 Subject: [PATCH] [Encrypted IMSI] Add support for EAP Method prefix Add support for EAP method prefix in the anonymous identity used during EAP-SIM/AKA/AKA' authentication when encrypted IMSI is used. Added a new boolean field enable_eap_method_prefix_bool in CarrierConfig, set to False as default. Bug: 142915637 Test: atest TelephonyUtilTest Change-Id: Ib184433aca550c19470354ab1c64295e3d9d3bce --- .../java/android/telephony/CarrierConfigManager.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index eea08dc6c76bc..fdf88497db02f 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2481,7 +2481,6 @@ public class CarrierConfigManager { */ public static final String IMSI_KEY_AVAILABILITY_INT = "imsi_key_availability_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 @@ -3119,6 +3118,16 @@ public class CarrierConfigManager { public static final String KEY_DATA_SWITCH_VALIDATION_TIMEOUT_LONG = "data_switch_validation_timeout_long"; + /** + * Specifies whether the system should prefix the EAP method to the anonymous identity. + * The following prefix will be added if this key is set to TRUE: + * EAP-AKA: "0" + * EAP-SIM: "1" + * EAP-AKA_PRIME: "6" + * @hide + */ + public static final String ENABLE_EAP_METHOD_PREFIX_BOOL = "enable_eap_method_prefix_bool"; + /** * GPS configs. See the GNSS HAL documentation for more details. */ @@ -3934,6 +3943,7 @@ public class CarrierConfigManager { CellSignalStrengthLte.USE_RSRP | CellSignalStrengthLte.USE_RSSNR); // Default wifi configurations. sDefaults.putAll(Wifi.getDefaults()); + sDefaults.putBoolean(ENABLE_EAP_METHOD_PREFIX_BOOL, false); } /**