From 60e5f7ca9c30de8bb8ad8b4d91bc478624fa4902 Mon Sep 17 00:00:00 2001 From: Tyler Gunn Date: Mon, 6 Apr 2020 15:07:48 -0700 Subject: [PATCH] Add carrier config to indicate if cep is supported on peer. Adding new carrier config option to indicate if conference event package data is supported on the conference peer. We already have an option for the conference host. This new option is used to indicate when the peer can or cannot support the CEP data. When not supported, even if the network provides CEP data, it is ignored by the device. Test: Manual testing using test intents. Test: Added unit tests for these cases. Fixes: 150860282 Change-Id: Ib8d8f171699f21f45b0ce2eec2dbe75d7466b76a --- .../android/telephony/CarrierConfigManager.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 78e5f2d814def..b0570a1cf319d 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -1138,6 +1138,21 @@ public class CarrierConfigManager { public static final String KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_BOOL = "support_ims_conference_event_package_bool"; + /** + * Determines whether processing of conference event package data received on a device other + * than the conference host is supported. + *

+ * When a device A merges calls B and C into a conference it is considered the conference host + * and B and C are considered the conference peers. + *

+ * When {@code true}, the conference peer will display the conference state if it receives + * conference event package data from the network. When {@code false}, the conference peer will + * ignore conference event package data received from the network. + * @hide + */ + public static final String KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_ON_PEER_BOOL = + "support_ims_conference_event_package_on_peer_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 @@ -3772,6 +3787,7 @@ public class CarrierConfigManager { 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_IMS_CONFERENCE_EVENT_PACKAGE_ON_PEER_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);