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

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

Merge "Merge "Add carrier config to hide merge button for IMS conference" am:... 

Merge "Merge "Add carrier config to hide merge button for IMS conference" am: 78b3cbe4 am: ec22b62a am: 611d2fb1" into oc-dev-plus-aosp
parents 47b3cf76 1b2bb382

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Diff line number Diff line
@@ -754,6 +754,14 @@ public class CarrierConfigManager { 
    public static final String KEY_DISPLAY_HD_AUDIO_PROPERTY_BOOL =

            "display_hd_audio_property_bool";



    /**

     * Determines whether IMS conference calls are supported by a carrier.  When {@code true},

     * IMS conference calling is supported, {@code false} otherwise.

     * @hide

     */

    public static final String KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL =

            "support_ims_conference_call_bool";



    /**

     * Determines whether video conference calls are supported by a carrier.  When {@code true},

     * video calls can be merged into conference calls, {@code false} otherwiwse.
@@ -1531,6 +1539,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);

        sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);

        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL, false);

        sDefaults.putInt(KEY_IMS_CONFERENCE_SIZE_LIMIT_INT, 5);