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

Commit fb1c1a61 authored by Hall Liu's avatar Hall Liu Committed by android-build-merger
Browse files

Merge "Propagate some SIP INVITE header fields on a MT call" 

am: a24ced9e

Change-Id: I66ce5d830b55c955ab9b4c88cff881f22faeddb5
parents 5f702170 a24ced9e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41458,6 +41458,7 @@ package android.telecom { 
    field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";

    field public static final java.lang.String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";

    field public static final java.lang.String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";

    field public static final java.lang.String EXTRA_SIP_INVITE = "android.telecom.extra.SIP_INVITE";

    field public static final int PROPERTY_HAS_CDMA_VOICE_PRIVACY = 32; // 0x20

    field public static final int PROPERTY_IS_EXTERNAL_CALL = 16; // 0x10

    field public static final int PROPERTY_IS_RTT = 256; // 0x100

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -6010,6 +6010,7 @@ package android.telephony.ims { 
    field public static final int DIALSTRING_SS_CONF = 1; // 0x1

    field public static final int DIALSTRING_USSD = 2; // 0x2

    field public static final java.lang.String EXTRA_ADDITIONAL_CALL_INFO = "AdditionalCallInfo";

    field public static final java.lang.String EXTRA_ADDITIONAL_SIP_INVITE_FIELDS = "android.telephony.ims.extra.ADDITIONAL_SIP_INVITE_FIELDS";

    field public static final java.lang.String EXTRA_CALL_RAT_TYPE = "CallRadioTech";

    field public static final java.lang.String EXTRA_CHILD_NUMBER = "ChildNum";

    field public static final java.lang.String EXTRA_CNA = "cna";

telecomm/java/android/telecom/Connection.java

+5 −0
Original line number Diff line number Diff line
@@ -614,6 +614,11 @@ public abstract class Connection extends Conferenceable { 
    public static final String EVENT_HANDOVER_FAILED =

            "android.telecom.event.HANDOVER_FAILED";



    /**

     * Connection extra key used to store SIP invite fields for an incoming call for IMS calls

     */

    public static final String EXTRA_SIP_INVITE = "android.telecom.extra.SIP_INVITE";



    // Flag controlling whether PII is emitted into the logs

    private static final boolean PII_DEBUG = Log.isLoggable(android.util.Log.DEBUG);

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

+2 −0
Original line number Diff line number Diff line
@@ -262,6 +262,8 @@ public final class ImsCallProfile implements Parcelable { 
    public static final String EXTRA_DISPLAY_TEXT = "DisplayText";

    public static final String EXTRA_ADDITIONAL_CALL_INFO = "AdditionalCallInfo";

    public static final String EXTRA_IS_CALL_PULL = "CallPull";

    public static final String EXTRA_ADDITIONAL_SIP_INVITE_FIELDS =

                                  "android.telephony.ims.extra.ADDITIONAL_SIP_INVITE_FIELDS";



    /**

     * Extra key which the RIL can use to indicate the radio technology used for a call.