Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Extend the service configuration for the binding service."

Browse Source 
am: 7145807316

Change-Id: I1526021cf49f873159b66eeddf2cc39ad71655eb
This commit is contained in:
Jack Yu
2019-06-06 11:13:40 -07:00
committed by android-build-merger
parent e6970c06d7 7145807316
commit 45f38d4f48
3 changed files with 61 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/res/res/values/config.xml
View File

@@ -2806,6 +2806,14 @@
empty string is passed in -->
<string name="config_wlan_data_service_package" translatable="false"></string>
<!-- Cellular data service class name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wwan_data_service_class" translatable="false"></string>
<!-- IWLAN data service class name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wlan_data_service_class" translatable="false"></string>
<bool name="config_networkSamplingWakesDevice">true</bool>
<!--From SmsMessage-->
@@ -3543,13 +3551,21 @@
<!-- Cellular network service package name to bind to by default. -->
<string name="config_wwan_network_service_package" translatable="false">com.android.phone</string>
<!-- Cellular network service class name to bind to by default.-->
<string name="config_wwan_network_service_class" translatable="false"></string>
<!-- IWLAN network service package name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wlan_network_service_package" translatable="false"></string>
<!-- IWLAN network service class name to bind to by default. If none is specified in an overlay, an
empty string is passed in -->
<string name="config_wlan_network_service_class" translatable="false"></string>
<!-- Telephony qualified networks service package name to bind to by default. -->
<string name="config_qualified_networks_service_package" translatable="false"></string>
<!-- Telephony qualified networks service class name to bind to by default. -->
<string name="config_qualified_networks_service_class" translatable="false"></string>
<!-- Wear devices: Controls the radios affected by Activity Mode. -->
<string-array name="config_wearActivityModeRadios">
<item>"wifi"</item>

5
core/res/res/values/symbols.xml
View File

@@ -271,9 +271,14 @@
<java-symbol type="bool" name="config_dynamic_bind_ims" />
<java-symbol type="string" name="config_wwan_network_service_package" />
<java-symbol type="string" name="config_wlan_network_service_package" />
<java-symbol type="string" name="config_wwan_network_service_class" />
<java-symbol type="string" name="config_wlan_network_service_class" />
<java-symbol type="string" name="config_wwan_data_service_package" />
<java-symbol type="string" name="config_wlan_data_service_package" />
<java-symbol type="string" name="config_wwan_data_service_class" />
<java-symbol type="string" name="config_wlan_data_service_class" />
<java-symbol type="string" name="config_qualified_networks_service_package" />
<java-symbol type="string" name="config_qualified_networks_service_class" />
<java-symbol type="bool" name="config_networkSamplingWakesDevice" />
<java-symbol type="bool" name="config_showMenuShortcutsWhenKeyboardPresent" />
<java-symbol type="bool" name="config_sip_wifi_only" />

40
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -672,6 +672,22 @@ public class CarrierConfigManager {
public static final String KEY_CARRIER_DATA_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING
= "carrier_data_service_wlan_package_override_string";
/**
* Override the device's configuration for the cellular data service class to use
* for this SIM card.
* @hide
*/
public static final String KEY_CARRIER_DATA_SERVICE_WWAN_CLASS_OVERRIDE_STRING =
"carrier_data_service_wwan_class_override_string";
/**
* Override the device's configuration for the IWLAN data service class to use
* for this SIM card.
* @hide
*/
public static final String KEY_CARRIER_DATA_SERVICE_WLAN_CLASS_OVERRIDE_STRING =
"carrier_data_service_wlan_class_override_string";
/** Flag specifying whether VoLTE TTY is supported. */
public static final String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL
= "carrier_volte_tty_supported_bool";
@@ -2383,6 +2399,14 @@ public class CarrierConfigManager {
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 iwlan network service, which class name will
* the binding intent go to.
* @hide
*/
public static final String KEY_CARRIER_NETWORK_SERVICE_WLAN_CLASS_OVERRIDE_STRING =
"carrier_network_service_wlan_class_override_string";
/**
* Decides when clients try to bind to wwan (cellular) network service, which package name will
* the binding intent go to.
@@ -2391,6 +2415,14 @@ public class CarrierConfigManager {
public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_PACKAGE_OVERRIDE_STRING =
"carrier_network_service_wwan_package_override_string";
/**
* Decides when clients try to bind to wwan (cellular) network service, which class name will
* the binding intent go to.
* @hide
*/
public static final String KEY_CARRIER_NETWORK_SERVICE_WWAN_CLASS_OVERRIDE_STRING =
"carrier_network_service_wwan_class_override_string";
/**
* The package name of qualified networks service that telephony binds to.
*
@@ -2398,6 +2430,14 @@ public class CarrierConfigManager {
*/
public static final String KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_PACKAGE_OVERRIDE_STRING =
"carrier_qualified_networks_service_package_override_string";
/**
* The class name of qualified networks service that telephony binds to.
*
* @hide
*/
public static final String KEY_CARRIER_QUALIFIED_NETWORKS_SERVICE_CLASS_OVERRIDE_STRING =
"carrier_qualified_networks_service_class_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.