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

Commit d22755ae authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "IMS-VT: Add config to control holding a video call" am: fc72e795 am:... 

Merge "IMS-VT: Add config to control holding a video call" am: fc72e795 am: 0336989e am: ebf4a71e

Change-Id: Icf23f0ce92c4596929260c1537163d5df9a417cf
parents 699741ec ebf4a71e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -44617,6 +44617,7 @@ package android.telephony { 
    field public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL = "allow_add_call_during_video_call";

    field public static final String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool";

    field public static final String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool";

    field public static final String KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL = "allow_holding_video_call";

    field public static final String KEY_ALLOW_HOLD_CALL_DURING_EMERGENCY_BOOL = "allow_hold_call_during_emergency_bool";

    field public static final String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool";

    field public static final String KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL = "allow_merge_wifi_calls_when_vowifi_off_bool";

telephony/java/android/telephony/CarrierConfigManager.java

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

            "allow_add_call_during_video_call";



    /**

     * When false, indicates that holding a video call is disabled

     */

    public static final String KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL =

            "allow_holding_video_call";



    /**

     * When true, indicates that the HD audio icon in the in-call screen should not be shown for

     * VoWifi calls.
@@ -3646,6 +3652,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_DROP_VIDEO_CALL_WHEN_ANSWERING_AUDIO_CALL_BOOL, false);

        sDefaults.putBoolean(KEY_ALLOW_MERGE_WIFI_CALLS_WHEN_VOWIFI_OFF_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_HOLDING_VIDEO_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_WIFI_CALLS_CAN_BE_HD_AUDIO, true);

        sDefaults.putBoolean(KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO, true);

        sDefaults.putBoolean(KEY_GSM_CDMA_CALLS_CAN_BE_HD_AUDIO, false);