diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 87fad161c5c66..0133534928dc3 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2216,6 +2216,11 @@ false + + true + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 6b45574dceff0..75528e2dc73ee 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2220,6 +2220,7 @@ + diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 88fc78be7e607..e27ab527659c7 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -876,6 +876,11 @@ public class CarrierConfigManager { /** * Flag indicating whether the carrier supports the Hold command while in an IMS call. + *

+ * 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";