Merge "Add carrier config for conference participants data support" into qt-dev

am: 23b6339ebd

Change-Id: Id1e5fcf1fbdfe47c73a8e76949ce4d75f03f9ed7
This commit is contained in:
Youming Ye
2019-06-21 17:33:29 -07:00
committed by android-build-merger

View File

@@ -1020,6 +1020,15 @@ public class CarrierConfigManager {
public static final String KEY_SUPPORT_MANAGE_IMS_CONFERENCE_CALL_BOOL =
"support_manage_ims_conference_call_bool";
/**
* Determines whether the IMS conference merge process supports and returns its participants
* data. When {@code true}, on merge complete, conference call would have a list of its
* participants returned in XML format, {@code false otherwise}.
* @hide
*/
public static final String KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL =
"support_ims_conference_event_package_bool";
/**
* 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
@@ -3148,6 +3157,7 @@ public class CarrierConfigManager {
sDefaults.putBoolean(KEY_SUPPORT_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_IMS_CONFERENCE_EVENT_PACKAGE_BOOL, true);
sDefaults.putBoolean(KEY_SUPPORT_VIDEO_CONFERENCE_CALL_BOOL, false);
sDefaults.putBoolean(KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL, false);
sDefaults.putInt(KEY_IMS_CONFERENCE_SIZE_LIMIT_INT, 5);