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

Add device config to determine when "allow hold" carrier config is used.

Browse Source 
am: d81c426e1d

Change-Id: Idd16d4b9977fa0773b788931ed77f8f0f3d8e8dd
This commit is contained in:
Tyler Gunn
2016-08-26 20:33:09 +00:00
committed by android-build-merger
parent 2265267555 d81c426e1d
commit 6c619a2abb
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2200,6 +2200,11 @@
<!-- Flag specifying whether VT is available on device --> <!-- Flag specifying whether VT is available on device -->
<bool name="config_device_vt_available">false</bool> <bool name="config_device_vt_available">false</bool>
<!-- Flag specifying whether the device will use the "allow_hold_in_ims_call" carrier config
option. When false, the device will support holding of IMS calls, regardless of the
carrier config setting. -->
<bool name="config_device_respects_hold_carrier_config">true</bool>
<!-- Flag specifying whether VT should be available for carrier: independent of <!-- Flag specifying whether VT should be available for carrier: independent of
carrier provisioning. If false: hard disabled. If true: then depends on carrier carrier provisioning. If false: hard disabled. If true: then depends on carrier
provisioning, availability etc --> provisioning, availability etc -->

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

@@ -2216,6 +2216,7 @@
<java-symbol type="bool" name="config_carrier_volte_provisioned" /> <java-symbol type="bool" name="config_carrier_volte_provisioned" />
<java-symbol type="bool" name="config_carrier_volte_tty_supported" /> <java-symbol type="bool" name="config_carrier_volte_tty_supported" />
<java-symbol type="bool" name="config_device_vt_available" /> <java-symbol type="bool" name="config_device_vt_available" />
<java-symbol type="bool" name="config_device_respects_hold_carrier_config" />
<java-symbol type="bool" name="config_carrier_vt_available" /> <java-symbol type="bool" name="config_carrier_vt_available" />
<java-symbol type="bool" name="config_device_wfc_ims_available" /> <java-symbol type="bool" name="config_device_wfc_ims_available" />
<java-symbol type="bool" name="config_carrier_wfc_ims_available" /> <java-symbol type="bool" name="config_carrier_wfc_ims_available" />

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

@@ -870,6 +870,11 @@ public class CarrierConfigManager {
/** /**
* Flag indicating whether the carrier supports the Hold command while in an IMS call. * Flag indicating whether the carrier supports the Hold command while in an IMS call.
* <p>
* The device configuration value {@code config_device_respects_hold_carrier_config} ultimately
* controls whether this carrier configuration option is used. Where
* {@code config_device_respects_hold_carrier_config} is false, the value of the
* {@link #KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL} carrier configuration option is ignored.
* @hide * @hide
*/ */
public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call"; public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call";