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

Commit 7a42c361 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Add carrier config variable to hide manage IMS conference call button" 

am: dc98d6e4

Change-Id: I474338d3475706f856e63fc8c558850c3afd0bb3
parents 3221d231 dc98d6e4

telephony/java/android/telephony/CarrierConfigManager.java

+9 −0
Original line number Original line Diff line number Diff line
@@ -804,6 +804,14 @@ public class CarrierConfigManager { 
     */

     */

    public static final String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int";

    public static final String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int";





    /**

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

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

     * @hide

     */

    public static final String KEY_SUPPORT_MANAGE_IMS_CONFERENCE_CALL_BOOL =

            "support_manage_ims_conference_call_bool";



    /**

    /**

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

     * 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

     * If {@code false}, remove the HD audio property from the connection so that HD audio related
@@ -1807,6 +1815,7 @@ public class CarrierConfigManager { 
        sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);

        sDefaults.putInt(KEY_CDMA_3WAYCALL_FLASH_DELAY_INT , 0);

        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_SUPPORT_IMS_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_VIDEO_CONFERENCE_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL, false);

        sDefaults.putBoolean(KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL, false);

        sDefaults.putInt(KEY_IMS_CONFERENCE_SIZE_LIMIT_INT, 5);

        sDefaults.putInt(KEY_IMS_CONFERENCE_SIZE_LIMIT_INT, 5);