Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 020212c7 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge "Add device config to determine when "allow hold" carrier config is used." into nyc-mr1-dev

parents 80855e15 d81c426e

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -2153,6 +2153,11 @@ 
    <!-- Flag specifying whether VT is available on device -->

    <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

         carrier provisioning. If false: hard disabled. If true: then depends on carrier

         provisioning, availability etc -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2211,6 +2211,7 @@ 
  <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_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_device_wfc_ims_available" />

  <java-symbol type="bool" name="config_carrier_wfc_ims_available" />

telephony/java/android/telephony/CarrierConfigManager.java

+5 −0
Original line number Diff line number Diff line
@@ -870,6 +870,11 @@ public class CarrierConfigManager { 


    /**

     * 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

     */

    public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call";