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

Commit c84f5465 authored by Alex Khlivnuik's avatar Alex Khlivnuik Committed by android-build-merger
Browse files

Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls"... 

Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" am: 0be23629 am: c9cfb504
am: 114adea7

Change-Id: I606353211d342fd87c92103b4277129454a4ceea
parents 4c6be5b5 114adea7

telephony/java/android/telephony/CarrierConfigManager.java

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

     */

    public static final String KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO = "video_calls_can_be_hd_audio";

    public static final String KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO = "video_calls_can_be_hd_audio";





    /**

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

     * GSM/CDMA calls.

     * @hide

     */

    public static final String KEY_GSM_CDMA_CALLS_CAN_BE_HD_AUDIO =

            "gsm_cdma_calls_can_be_hd_audio";



    /**

    /**

     * Whether system apps are allowed to use fallback if carrier video call is not available.

     * Whether system apps are allowed to use fallback if carrier video call is not available.

     * Defaults to {@code true}.

     * Defaults to {@code true}.
@@ -2033,6 +2041,7 @@ public class CarrierConfigManager { 
        sDefaults.putBoolean(KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL, true);

        sDefaults.putBoolean(KEY_WIFI_CALLS_CAN_BE_HD_AUDIO, true);

        sDefaults.putBoolean(KEY_WIFI_CALLS_CAN_BE_HD_AUDIO, true);

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

        sDefaults.putBoolean(KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL, true);

        sDefaults.putBoolean(KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL, true);





        sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);

        sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);