Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" am: 0be23629a8

am: c9cfb504f7

Change-Id: I1ae7bb4715c9bffb7c6b2d57da17862f7c25ad55
This commit is contained in:
Alex Khlivnuik
2018-02-02 04:18:38 +00:00
committed by android-build-merger

View File

@@ -1387,6 +1387,14 @@ public class CarrierConfigManager {
*/
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.
* Defaults to {@code true}.
@@ -2023,6 +2031,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_ALLOW_ADD_CALL_DURING_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);
sDefaults.putBoolean(KEY_ALLOW_VIDEO_CALLING_FALLBACK_BOOL, true);
sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);