diff options
| author | 2017-01-10 23:55:55 +0000 | |
|---|---|---|
| committer | 2017-01-10 23:55:55 +0000 | |
| commit | 11765b3fcc776ca93eb9cf7b024a7c09b7d7555c (patch) | |
| tree | 42ed29356ae9b310b707eb5bc59138b8a7752b34 | |
| parent | 6c852fb22802ef8da44d2806fa0f17f08acd9542 (diff) | |
| parent | 1d67d022fb5f49ce88bae26d1175c1f391b025d6 (diff) | |
Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885
am: 1d67d022fb
Change-Id: I6165395ac186baac90c2d08d7c7114c7b5bc72d3
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 2c2b8642116a..28e22d9d124c 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1069,7 +1069,7 @@ public class CarrierConfigManager { * is returned. * @hide */ - public static final String FILTERED_CNAP_NAMES_STRING_ARRAY = "filtered_cnap_names_string_array"; + public static final String KEY_FILTERED_CNAP_NAMES_STRING_ARRAY = "filtered_cnap_names_string_array"; /** * Determine whether user can change Wi-Fi Calling preference in roaming. @@ -1320,7 +1320,7 @@ public class CarrierConfigManager { sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null); sDefaults.putBoolean(KEY_ENHANCED_4G_LTE_TITLE_VARIANT_BOOL, false); sDefaults.putBoolean(KEY_NOTIFY_VT_HANDOVER_TO_WIFI_FAILURE_BOOL, false); - sDefaults.putStringArray(FILTERED_CNAP_NAMES_STRING_ARRAY, null); + sDefaults.putStringArray(KEY_FILTERED_CNAP_NAMES_STRING_ARRAY, null); sDefaults.putBoolean(KEY_EDITABLE_WFC_ROAMING_MODE_BOOL, false); sDefaults.putBoolean(KEY_STK_DISABLE_LAUNCH_BROWSER_BOOL, false); sDefaults.putStringArray(KEY_CARRIER_WIFI_STRING_ARRAY, null); |