From 7d08c8e8c12e42bb1de47198ab098cf07cb34c2c Mon Sep 17 00:00:00 2001 From: Naina Nalluri Date: Fri, 19 Feb 2021 08:37:05 -0800 Subject: [PATCH] Remove iwlan mac config Bug: 180627285 Test: Unit tests adb shell cmd phone cc get-value [KEY] failed Change-Id: I65ff023ba94c2af752490375f41fe845252eb8ad --- core/api/current.txt | 1 - telephony/java/android/telephony/CarrierConfigManager.java | 5 ----- 2 files changed, 6 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 5dee655094232..3d5ca2129bf03 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -40840,7 +40840,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"; diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 6d3fa81a856d0..d690f473f924d 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -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);