diff options
4 files changed, 20 insertions, 7 deletions
diff --git a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml index 2a632ac..b74bd8f 100644 --- a/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml +++ b/assets/carrier_config_carrierid_1839_Verizon-Wireless.xml @@ -108,7 +108,7 @@ <boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true"/> <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true"/> <boolean name="operator_selection_expand_bool" value="true"/> - <boolean name="persist_lpp_mode_bool" value="true"/> + <boolean name="gps.persist_lpp_mode_bool" value="true"/> <boolean name="prefer_2g_bool" value="false"/> <string-array name="read_only_apn_fields_string_array" num="20"> <item value="name"/> diff --git a/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml b/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml index 9c4ab63..4ca5e68 100644 --- a/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml +++ b/assets/carrier_config_carrierid_2032_XFINIY-Mobile.xml @@ -110,7 +110,7 @@ <boolean name="notify_handover_video_from_wifi_to_lte_bool" value="true"/> <boolean name="notify_vt_handover_to_wifi_failure_bool" value="true"/> <boolean name="operator_selection_expand_bool" value="true"/> - <boolean name="persist_lpp_mode_bool" value="true"/> + <boolean name="gps.persist_lpp_mode_bool" value="true"/> <boolean name="prefer_2g_bool" value="false"/> <string-array name="read_only_apn_fields_string_array" num="20"> <item value="name"/> diff --git a/assets/carrier_config_mccmnc_310004.xml b/assets/carrier_config_mccmnc_310004.xml index 64b2e74..e0fbb4b 100644 --- a/assets/carrier_config_mccmnc_310004.xml +++ b/assets/carrier_config_mccmnc_310004.xml @@ -52,7 +52,7 @@ <boolean name="editable_wfc_mode_bool" value="false"/> <boolean name="editable_wfc_roaming_mode_bool" value="true"/> <boolean name="disable_severe_when_extreme_disabled_bool" value="false" /> - <boolean name="persist_lpp_mode_bool" value="true" /> + <boolean name="gps.persist_lpp_mode_bool" value="true" /> <boolean name="mmsCloseConnection" value="true"/> <int name="wfc_spn_format_idx_int" value="1" /> <string-array name="read_only_apn_fields_string_array" num="20"> diff --git a/tests/src/com/android/carrierconfig/CarrierConfigTest.java b/tests/src/com/android/carrierconfig/CarrierConfigTest.java index 7b1d8f7..4b78fd6 100644 --- a/tests/src/com/android/carrierconfig/CarrierConfigTest.java +++ b/tests/src/com/android/carrierconfig/CarrierConfigTest.java @@ -251,13 +251,26 @@ public class CarrierConfigTest extends InstrumentationTestCase { * Get the set of config variable names, as used in XML files. */ private Set<String> getCarrierConfigXmlNames() { - // get values of all KEY_ members of CarrierConfigManager - Field[] fields = CarrierConfigManager.class.getDeclaredFields(); + Set<String> names = new HashSet<>(); + // get values of all KEY_ members of CarrierConfigManager as well as its nested classes. + names.addAll(getCarrierConfigXmlNames(CarrierConfigManager.class)); + for (Class nested : CarrierConfigManager.class.getDeclaredClasses()) { + Log.i("CarrierConfigTest", nested.toString()); + if (Modifier.isStatic(nested.getModifiers())) { + names.addAll(getCarrierConfigXmlNames(nested)); + } + } + return names; + } + + private Set<String> getCarrierConfigXmlNames(Class clazz) { + // get values of all KEY_ members of clazz + Field[] fields = clazz.getDeclaredFields(); HashSet<String> varXmlNames = new HashSet<>(); for (Field f : fields) { if (!f.getName().startsWith("KEY_")) continue; - if ((f.getModifiers() & Modifier.STATIC) == 0) { - fail("non-static key in CarrierConfigManager: " + f.toString()); + if (!Modifier.isStatic(f.getModifiers())) { + fail("non-static key in " + clazz.getName() + ":" + f.toString()); } try { String value = (String) f.get(null); |