From 1ca2e31d82d9ab386b5d668acd963bf6dd420bd7 Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Thu, 1 Dec 2016 11:39:30 -0800 Subject: Rename key declaration to start with "KEY" CarrierConfigTeset validates carrier_config xmls by comparing them to static fields starting with "KEY_" declared in CarrierConfigManager. This commit renmaes the key so the test passes. Change-Id: Iebb11739ae16e56fe1a0b2fdc9a3e005a71858dc Test: runtest carrierconfig-unit --- telephony/java/android/telephony/CarrierConfigManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 1f06283304ca..d048b40d9339 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1067,7 +1067,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"; /** * The RCS configuration server URL. This URL is used to initiate RCS provisioning. @@ -1291,7 +1291,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.putBoolean(KEY_PERSIST_LPP_MODE_BOOL, false); -- cgit v1.2.3-59-g8ed1b