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

Commit 5baf9fa7 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-91abecac10b94043be1419edddac2a94' into nyc-mr1-dev-plus-aosp 

* changes:
  Merge \"Add CarrierConfig to remove hold during Ims Calls\" into nyc-mr1-dev am: dee7dffb
  Add CarrierConfig to remove hold during Ims Calls am: c8601013
parents a01c797c 0a01fc3f

telephony/java/android/telephony/CarrierConfigManager.java

+7 −0
Original line number Diff line number Diff line
@@ -845,6 +845,12 @@ public class CarrierConfigManager { 
    public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL =

            "allow_merge_wifi_calls_when_vowifi_off_bool";



    /**

     * Flag indicating whether the carrier supports the Hold command while in an IMS call.

     * @hide

     */

    public static final String KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL = "allow_hold_in_ims_call";



    /**

     * When true, indicates that adding a call is disabled when there is an ongoing video call

     * or when there is an ongoing call on wifi which was downgraded from video and VoWifi is
@@ -891,6 +897,7 @@ public class CarrierConfigManager { 


    static {

        sDefaults = new PersistableBundle();

        sDefaults.putBoolean(KEY_ALLOW_HOLD_IN_IMS_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_ADDITIONAL_CALL_SETTING_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_LOCAL_DTMF_TONES_BOOL, true);