diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index a4b5d60248951..55a87ee202dfe 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -2153,6 +2153,11 @@ false + + true + diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 924d338091240..c687fe8b0d54d 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -2211,6 +2211,7 @@ + diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index dc9767caf01e4..d6a2ee3c24000 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -870,6 +870,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";