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

Commit 8a43d3dc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove iwlan mac config" into sc-dev am: e7f53e4d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13628333

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic669006efd1430db0ceba3f7e476743cf33d13d3
parents 356c3590 e7f53e4d

core/api/current.txt

+0 −1
Original line number Diff line number Diff line
@@ -40848,7 +40848,6 @@ package android.telephony { 
    field public static final int INTEGRITY_ALGORITHM_HMAC_SHA2_512_256 = 14; // 0xe

    field public static final int INTEGRITY_ALGORITHM_NONE = 0; // 0x0

    field public static final String KEY_ADD_KE_TO_CHILD_SESSION_REKEY_BOOL = "iwlan.add_ke_to_child_session_rekey_bool";

    field public static final String KEY_ADD_WIFI_MAC_ADDR_TO_NAI_BOOL = "iwlan.add_wifi_mac_addr_to_nai_bool";

    field public static final String KEY_CHILD_SA_REKEY_HARD_TIMER_SEC_INT = "iwlan.child_sa_rekey_hard_timer_sec_int";

    field public static final String KEY_CHILD_SA_REKEY_SOFT_TIMER_SEC_INT = "iwlan.child_sa_rekey_soft_timer_sec_int";

    field public static final String KEY_CHILD_SESSION_AES_CBC_KEY_SIZE_INT_ARRAY = "iwlan.child_session_aes_cbc_key_size_int_array";

telephony/java/android/telephony/CarrierConfigManager.java

+0 −5
Original line number Diff line number Diff line
@@ -4230,10 +4230,6 @@ public class CarrierConfigManager { 
        public static final String KEY_RETRANSMIT_TIMER_MSEC_INT_ARRAY =

                KEY_PREFIX + "retransmit_timer_sec_int_array";



        /** Controls if wifi mac Id should be added to network access identifier(NAI) */

        public static final String KEY_ADD_WIFI_MAC_ADDR_TO_NAI_BOOL =

                KEY_PREFIX + "add_wifi_mac_addr_to_nai_bool";



        /**

         * Specifies the local identity type for IKE negotiations. Possible values are {@link

         * #ID_TYPE_FQDN}, {@link #ID_TYPE_RFC822_ADDR}, {@link #ID_TYPE_KEY_ID}
@@ -4557,7 +4553,6 @@ public class CarrierConfigManager { 
                    KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY,

                    new int[] {EPDG_ADDRESS_PLMN, EPDG_ADDRESS_STATIC});

            defaults.putStringArray(KEY_MCC_MNCS_STRING_ARRAY, new String[] {});

            defaults.putBoolean(KEY_ADD_WIFI_MAC_ADDR_TO_NAI_BOOL, false);

            defaults.putInt(KEY_IKE_LOCAL_ID_TYPE_INT, ID_TYPE_RFC822_ADDR);

            defaults.putInt(KEY_IKE_REMOTE_ID_TYPE_INT, ID_TYPE_FQDN);

            defaults.putBoolean(KEY_ADD_KE_TO_CHILD_SESSION_REKEY_BOOL, false);