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

Commit 73df128a authored by Tyler Gunn's avatar Tyler Gunn Committed by Automerger Merge Worker
Browse files

Merge "Add Device to Device communication carrier configs." into sc-dev am: a61de115 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13775558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib26c4cde734243d5c5a130aa0c7477b79cebe807
parents 82eb1f96 a61de115

core/api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -40530,6 +40530,9 @@ package android.telephony { 
    field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";

    field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";

    field public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool";

    field public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_DTMF_BOOL = "supports_device_to_device_communication_using_dtmf_bool";

    field public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_RTP_BOOL = "supports_device_to_device_communication_using_rtp_bool";

    field public static final String KEY_SUPPORTS_SDP_NEGOTIATION_OF_D2D_RTP_HEADER_EXTENSIONS_BOOL = "supports_sdp_negotiation_of_d2d_rtp_header_extensions_bool";

    field public static final String KEY_SUPPORT_3GPP_CALL_FORWARDING_WHILE_ROAMING_BOOL = "support_3gpp_call_forwarding_while_roaming_bool";

    field public static final String KEY_SUPPORT_ADD_CONFERENCE_PARTICIPANTS_BOOL = "support_add_conference_participants_bool";

    field public static final String KEY_SUPPORT_ADHOC_CONFERENCE_CALLS_BOOL = "support_adhoc_conference_calls_bool";

telephony/java/android/telephony/CarrierConfigManager.java

+35 −0
Original line number Diff line number Diff line
@@ -1339,6 +1339,38 @@ public class CarrierConfigManager { 
    public static final String KEY_SUPPORT_IMS_CONFERENCE_EVENT_PACKAGE_ON_PEER_BOOL =

            "support_ims_conference_event_package_on_peer_bool";



    /**

     * Indicates whether the carrier supports the use of RFC8285 compliant RTP header extensions for

     * the purpose of device to device communication while in a call.

     * <p>

     * See also {@link #KEY_SUPPORTS_SDP_NEGOTIATION_OF_D2D_RTP_HEADER_EXTENSIONS_BOOL}.

     */

    public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_RTP_BOOL =

            "supports_device_to_device_communication_using_rtp_bool";



    /**

     * Indicates whether the carrier supports the negotiations of RFC8285 compliant RTP header

     * extensions supported on a call during the Session Description Protocol (SDP).  This option

     * is only used when {@link #KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_RTP_BOOL} is

     * {@code true}.

     * <p>

     * When {@code true}, the RTP header extensions the platform uses for device to device

     * communication will be offered to the remote end during the SDP negotiation process.

     * When {@code false}, the RTP header extensions will not be negotiated during the SDP

     * negotiation process and the platform will send RTP header extensions without prior

     * negotiation if {@link #KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_RTP_BOOL} is

     * {@code true}.

     */

    public static final String KEY_SUPPORTS_SDP_NEGOTIATION_OF_D2D_RTP_HEADER_EXTENSIONS_BOOL =

            "supports_sdp_negotiation_of_d2d_rtp_header_extensions_bool";



    /**

     * Indicates whether the carrier supports the use of DTMF digits A-D for the purpose of device

     * to device communication while in a call.

     */

    public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_DTMF_BOOL =

            "supports_device_to_device_communication_using_dtmf_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
@@ -5008,6 +5040,9 @@ public class CarrierConfigManager { 
        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_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_RTP_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORTS_SDP_NEGOTIATION_OF_D2D_RTP_HEADER_EXTENSIONS_BOOL, false);

        sDefaults.putBoolean(KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_DTMF_BOOL, false);

        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);