Merge \"Add carrier config keys for disabling HD icon\" into nyc-mr1-dev (c0519442) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/CarrierConfigManager.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -844,6 +844,20 @@ public class CarrierConfigManager {
		public static final String KEY_ALLOW_ADD_CALL_DURING_VIDEO_CALL_BOOL =
		"allow_add_call_during_video_call";

		/**
		* When true, indicates that the HD audio icon in the in-call screen should not be shown for
		* VoWifi calls.
		* @hide
		*/
		public static final String KEY_WIFI_CALLS_CAN_BE_HD_AUDIO = "wifi_calls_can_be_hd_audio";

		/**
		* When true, indicates that the HD audio icon in the in-call screen should not be shown for
		* video calls.
		* @hide
		*/
		public static final String KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO = "video_calls_can_be_hd_audio";

		/**
		* Defines operator-specific {@link com.android.ims.ImsReasonInfo} mappings.
		*
		@@ -1020,6 +1034,8 @@ 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_WIFI_CALLS_CAN_BE_HD_AUDIO, true);
		sDefaults.putBoolean(KEY_VIDEO_CALLS_CAN_BE_HD_AUDIO, true);

		sDefaults.putStringArray(KEY_IMS_REASONINFO_MAPPING_STRING_ARRAY, null);
		}