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

Commit c575a96d authored by Youming Ye's avatar Youming Ye Committed by android-build-merger
Browse files

Merge "Add carrier config for conference participants data support" 

am: 93931ccb

Change-Id: I67c0e554fbeec03561ff4a698f4a15a803bc7611
parents b5d6cc54 93931ccb

telephony/java/android/telephony/CarrierConfigManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1020,6 +1020,15 @@ public class CarrierConfigManager { 
    public static final String KEY_SUPPORT_MANAGE_IMS_CONFERENCE_CALL_BOOL =

            "support_manage_ims_conference_call_bool";



    /**

     * Determines whether the IMS conference merge process supports and returns its participants

     * data. When {@code true}, on merge complete, conference call would have a list of its

     * participants returned in XML format, {@code false otherwise}.

     * @hide

     */

    public static final String KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL =

            "support_ims_conference_event_package_bool";



    /**

     * Determines whether High Definition audio property is displayed in the dialer UI.

     * If {@code false}, remove the HD audio property from the connection so that HD audio related
@@ -2864,6 +2873,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_MANAGE_IMS_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_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);