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

Commit 559ac652 authored by Tyler Gunn's avatar Tyler Gunn
Browse files

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.
Bug: 150860282
Fixes: 154245604
Merged-In: I47b5e49acf08e085ea23e21a5f6b2d5a5d00bc09
Change-Id: Ib8d8f171699f21f45b0ce2eec2dbe75d7466b76a
parent 6e478ee4

telephony/java/android/telephony/CarrierConfigManager.java

+16 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,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.

     * <p>

     * 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.

     * <p>

     * 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
@@ -3734,6 +3749,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);