diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 3d25f20273028..8f1c9320c7626 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3490,6 +3490,9 @@ empty string is passed in --> + + + "wifi" diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index e17235f1ab3d6..4fd94a217207d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -273,6 +273,7 @@ + diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index c45a1ecc5dc9c..16ac0a5ab40cb 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1994,17 +1994,24 @@ public class CarrierConfigManager { * the binding intent go to. * @hide */ - public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING - = "carrier_network_service_wlan_package_override_string"; + public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING = + "carrier_network_service_wlan_package_override_string"; /** * Decides when clients try to bind to wwan (cellular) network service, which package name will * the binding intent go to. * @hide */ - public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING - = "carrier_network_service_wwan_package_override_string"; + public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING = + "carrier_network_service_wwan_package_override_string"; + /** + * The package name of qualified networks service that telephony binds to. + * + * @hide + */ + public static final String KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING = + "carrier_qualified_networks_service_package_override_string"; /** * A list of 4 LTE RSCP thresholds above which a signal level is considered POOR, * MODERATE, GOOD, or EXCELLENT, to be used in SignalStrength reporting. @@ -2085,6 +2092,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL, true); sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, ""); sDefaults.putString(KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, ""); + sDefaults.putString(KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING, ""); sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING, ""); sDefaults.putString(KEY_CARRIER_DATA_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING, ""); sDefaults.putString(KEY_CARRIER_INSTANT_LETTERING_INVALID_CHARS_STRING, "");