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

Commit cf7c72d8 authored by Pengfei Xiao's avatar Pengfei Xiao Committed by sungcheolahn
Browse files

Support video color ring back tone (video CRBT) 

- Add carrier config supports_video_back_tone_bool
- Add EXTRA_IS_USING_VIDEO_RINGBACK in ImsCallProfile
- Add EXTRA_IS_USING_VIDEO_RINGBACK in call

Bug: 427359973, 408116489
Change-Id: Id17d689b4ccca74e34b1e232ef018ce7bcae8d4e
Test: Manual
Flag: EXEMPT bug fix
parent cce71e41

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -43979,6 +43979,7 @@ package android.telecom { 
    field public static final String EXTRA_DIAGNOSTIC_MESSAGE_ID = "android.telecom.extra.DIAGNOSTIC_MESSAGE_ID";

    field @FlaggedApi("com.android.server.telecom.flags.business_call_composer") public static final String EXTRA_IS_BUSINESS_CALL = "android.telecom.extra.IS_BUSINESS_CALL";

    field public static final String EXTRA_IS_SUPPRESSED_BY_DO_NOT_DISTURB = "android.telecom.extra.IS_SUPPRESSED_BY_DO_NOT_DISTURB";

    field @FlaggedApi("com.android.server.telecom.flags.is_using_video_ringback") public static final String EXTRA_IS_USING_VIDEO_RINGBACK = "android.telecom.extra.IS_USING_VIDEO_RINGBACK";

    field public static final String EXTRA_LAST_EMERGENCY_CALLBACK_TIME_MILLIS = "android.telecom.extra.LAST_EMERGENCY_CALLBACK_TIME_MILLIS";

    field public static final String EXTRA_SILENT_RINGING_REQUESTED = "android.telecom.extra.SILENT_RINGING_REQUESTED";

    field public static final String EXTRA_SUGGESTED_PHONE_ACCOUNTS = "android.telecom.extra.SUGGESTED_PHONE_ACCOUNTS";
@@ -45656,6 +45657,7 @@ package android.telephony { 
    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 @FlaggedApi("com.android.server.telecom.flags.is_using_video_ringback") public static final String KEY_SUPPORTS_VIDEO_RINGBACK_BOOL = "supports_video_back_tone_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";

core/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -17446,6 +17446,7 @@ package android.telephony.ims { 
    field public static final String EXTRA_IS_BUSINESS_CALL = "android.telephony.ims.extra.IS_BUSINESS_CALL";

    field public static final String EXTRA_IS_CALL_PULL = "CallPull";

    field public static final String EXTRA_IS_CROSS_SIM_CALL = "android.telephony.ims.extra.IS_CROSS_SIM_CALL";

    field @FlaggedApi("com.android.server.telecom.flags.is_using_video_ringback") public static final String EXTRA_IS_USING_VIDEO_RINGBACK = "android.telephony.ims.extra.IS_USING_VIDEO_RINGBACK";

    field public static final String EXTRA_LOCATION = "android.telephony.ims.extra.LOCATION";

    field public static final String EXTRA_OI = "oi";

    field public static final String EXTRA_OIR = "oir";

telecomm/framework/java/android/telecom/Call.java

+10 −0
Original line number Diff line number Diff line
@@ -318,6 +318,16 @@ public final class Call { 
    public static final String EXTRA_ASSERTED_DISPLAY_NAME =

            "android.telecom.extra.ASSERTED_DISPLAY_NAME";



    /**

     * Boolean indicating that the call is a video

     * ring back tone call. {@link Connection#setExtras(Bundle)} or

     * {@link Connection#putExtras(Bundle)} should be used to notify

     * Telecom this extra has been set.

     */

    @FlaggedApi(Flags.FLAG_IS_USING_VIDEO_RINGBACK)

    public static final String EXTRA_IS_USING_VIDEO_RINGBACK =

                      "android.telecom.extra.IS_USING_VIDEO_RINGBACK";



    /**

     * Reject reason used with {@link #reject(int)} to indicate that the user is rejecting this

     * call because they have declined to answer it.  This typically means that they are unable

telephony/java/android/telephony/CarrierConfigManager.java

+8 −0
Original line number Diff line number Diff line
@@ -10333,6 +10333,13 @@ public class CarrierConfigManager { 
    public static final String KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING =

            "call_composer_picture_server_url_string";













    /**













     * Indicates if the carrier supports a video color ring back tone call (CRBT).













     */













    @FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_IS_USING_VIDEO_RINGBACK)













    public static final String KEY_SUPPORTS_VIDEO_RINGBACK_BOOL =













            "supports_video_back_tone_bool";



























    /**















     * Determines the default RTT mode.















     *










@@ -11495,6 +11502,7 @@ public class CarrierConfigManager {













        sDefaults.putString(KEY_DEFAULT_PREFERRED_APN_NAME_STRING, "");















        sDefaults.putBoolean(KEY_SUPPORTS_CALL_COMPOSER_BOOL, false);















        sDefaults.putBoolean(KEY_SUPPORTS_BUSINESS_CALL_COMPOSER_BOOL, false);













        sDefaults.putBoolean(KEY_SUPPORTS_VIDEO_RINGBACK_BOOL, false);















        sDefaults.putString(KEY_CALL_COMPOSER_PICTURE_SERVER_URL_STRING, "");















        sDefaults.putBoolean(KEY_USE_ACS_FOR_RCS_BOOL, false);















        sDefaults.putBoolean(KEY_NETWORK_TEMP_NOT_METERED_SUPPORTED_BOOL, true);

























telephony/java/android/telephony/ims/ImsCallProfile.java



+9
−0




























Original line number
Diff line number
Diff line








@@ -309,6 +309,15 @@ public final class ImsCallProfile implements Parcelable {













    public static final String EXTRA_ASSERTED_DISPLAY_NAME =















            "android.telephony.ims.extra.ASSERTED_DISPLAY_NAME";





























    /**













     * Boolean extra property indicates that this call is a Video Color Ring Back Tone













     * Call(Video CRBT).  Vendor IMS stack {@link ImsService} sets this on a call













     * to indicate that the modem/network has identified the call as a video CRBT call.













     */













    @FlaggedApi(com.android.server.telecom.flags.Flags.FLAG_IS_USING_VIDEO_RINGBACK)













    public static final String EXTRA_IS_USING_VIDEO_RINGBACK  =













             "android.telephony.ims.extra.IS_USING_VIDEO_RINGBACK";





























    /**















     * Values for EXTRA_OIR / EXTRA_CNAP















     */