Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d3e2948 authored by Ecco Park's avatar Ecco Park
Browse files

carrier-config: define imsi_eap_identity_sequence_int key 



Some of Carrier Wi-Fi Networks doesn't support receiving encrypted-IMSI
as EAP-RESPONSE/IDENTITY due to network deployment architecture.

So, a new key is required to define a sequence of sending encrypted-IMSI
identity during EAP-SIM/AKA authentication.
If this value is 2, anonymous@<realm> will be sent as a
EAP-RESPONSE/IDENTITY first and followd by
encrypted IMSI as EAP-RESPONSE/AKA|SIM-IDENTITY.
1: encrypted-IMSI (default one)
2: anonymous -> encrypted-IMSI.

Bug: 109795427
Test: manual
Change-Id: I1121f21b771707ed7c8350826cefc43445f4fc8b
Signed-off-by: default avatarEcco Park <eccopark@google.com>
parent 413b523b

telephony/java/android/telephony/CarrierConfigManager.java

+11 −0
Original line number Original line Diff line number Diff line
@@ -1895,6 +1895,16 @@ public class CarrierConfigManager { 
     */

     */

    public static final String KEY_IMSI_ENCODING_METHOD_INT = "imsi_encoding_method_int";

    public static final String KEY_IMSI_ENCODING_METHOD_INT = "imsi_encoding_method_int";





    /**

     * Defines the sequence of sending an encrypted IMSI identity for EAP-SIM/AKA authentication.

     * The value set as below:

     * 1 - encrypted IMSI as EAP-RESPONSE/IDENTITY (default one).

     * 2 - anonymous as EAP-RESPONSE/IDENTITY -> encrypted IMSI as EAP-RESPONSE/AKA|SIM-IDENTITY.

     *

     * @hide

     */

    public static final String KEY_EAP_IDENTITY_SEQUENCE_INT = "imsi_eap_identity_sequence_int";



    /**

    /**

     * Time delay (in ms) after which we show the notification to switch the preferred

     * Time delay (in ms) after which we show the notification to switch the preferred

     * network.

     * network.
@@ -3054,6 +3064,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_METERED_NETWORK_FOR_CERT_DOWNLOAD_BOOL, false);

        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null);

        sDefaults.putInt(KEY_IMSI_ENCODING_METHOD_INT, 2045);

        sDefaults.putInt(KEY_IMSI_ENCODING_METHOD_INT, 2045);

        sDefaults.putInt(KEY_EAP_IDENTITY_SEQUENCE_INT, 1);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putInt(KEY_PREF_NETWORK_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putInt(KEY_EMERGENCY_NOTIFICATION_DELAY_INT, -1);

        sDefaults.putBoolean(KEY_ALLOW_USSD_REQUESTS_VIA_TELEPHONY_MANAGER_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_USSD_REQUESTS_VIA_TELEPHONY_MANAGER_BOOL, true);