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

Commit c5e86971 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Support radio HAL V1.4 SetupDataCallResult and DataCallFailCause" 

am: 3788e914

Change-Id: I01620d1fa5bc8417ba154b76ad854fa64d6d042f
parents 68048199 3788e914

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -43235,7 +43235,9 @@ package android.telephony.data { 
    field public static final int PROTOCOL_IP = 0; // 0x0

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

    field public static final int PROTOCOL_IPV6 = 1; // 0x1

    field public static final int PROTOCOL_NON_IP = 4; // 0x4

    field public static final int PROTOCOL_PPP = 3; // 0x3

    field public static final int PROTOCOL_UNSTRUCTURED = 5; // 0x5

    field public static final int TYPE_CBS = 128; // 0x80

    field public static final int TYPE_DEFAULT = 17; // 0x11

    field public static final int TYPE_DUN = 8; // 0x8

api/system-current.txt

+262 −0

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/DataFailCause.java

+1328 −2

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/android/telephony/data/ApnSetting.java

+15 −5
Original line number Diff line number Diff line
@@ -140,15 +140,19 @@ public class ApnSetting implements Parcelable { 
    @Retention(RetentionPolicy.SOURCE)

    public @interface AuthType {}



    // Possible values for protocol.

    /** Protocol type for IP. */

    // Possible values for protocol which is defined in TS 27.007 section 10.1.1.

    /** Internet protocol. */

    public static final int PROTOCOL_IP = 0;

    /** Protocol type for IPV6. */

    /** Internet protocol, version 6. */

    public static final int PROTOCOL_IPV6 = 1;

    /** Protocol type for IPV4V6. */

    /** Virtual PDP type introduced to handle dual IP stack UE capability. */

    public static final int PROTOCOL_IPV4V6 = 2;

    /** Protocol type for PPP. */

    /** Point to point protocol. */

    public static final int PROTOCOL_PPP = 3;

    /** Transfer of Non-IP data to external packet data network. */

    public static final int PROTOCOL_NON_IP = 4;

    /** Transfer of Unstructured data to the Data Network via N6. */

    public static final int PROTOCOL_UNSTRUCTURED = 5;



    /** @hide */

    @IntDef(prefix = { "PROTOCOL_" }, value = {
@@ -156,6 +160,8 @@ public class ApnSetting implements Parcelable { 
        PROTOCOL_IPV6,

        PROTOCOL_IPV4V6,

        PROTOCOL_PPP,

        PROTOCOL_NON_IP,

        PROTOCOL_UNSTRUCTURED,

    })

    @Retention(RetentionPolicy.SOURCE)

    public @interface ProtocolType {}
@@ -217,11 +223,15 @@ public class ApnSetting implements Parcelable { 
        PROTOCOL_STRING_MAP.put("IPV6", PROTOCOL_IPV6);

        PROTOCOL_STRING_MAP.put("IPV4V6", PROTOCOL_IPV4V6);

        PROTOCOL_STRING_MAP.put("PPP", PROTOCOL_PPP);

        PROTOCOL_STRING_MAP.put("NON-IP", PROTOCOL_NON_IP);

        PROTOCOL_STRING_MAP.put("UNSTRUCTURED", PROTOCOL_UNSTRUCTURED);

        PROTOCOL_INT_MAP = new ArrayMap<Integer, String>();

        PROTOCOL_INT_MAP.put(PROTOCOL_IP, "IP");

        PROTOCOL_INT_MAP.put(PROTOCOL_IPV6, "IPV6");

        PROTOCOL_INT_MAP.put(PROTOCOL_IPV4V6, "IPV4V6");

        PROTOCOL_INT_MAP.put(PROTOCOL_PPP, "PPP");

        PROTOCOL_INT_MAP.put(PROTOCOL_NON_IP, "NON-IP");

        PROTOCOL_INT_MAP.put(PROTOCOL_UNSTRUCTURED, "UNSTRUCTURED");



        MVNO_TYPE_STRING_MAP = new ArrayMap<String, Integer>();

        MVNO_TYPE_STRING_MAP.put("spn", MVNO_TYPE_SPN);

telephony/java/android/telephony/data/DataCallResponse.java

+2 −3
Original line number Diff line number Diff line
@@ -52,8 +52,7 @@ public final class DataCallResponse implements Parcelable { 
     * @param status Data call fail cause. 0 indicates no error.

     * @param suggestedRetryTime The suggested data retry time in milliseconds.

     * @param cid The unique id of the data connection.

     * @param active Data connection active status. 0 = inactive, 1 = active/physical link down,

     *               2 = active/physical link up.

     * @param active Data connection active status. 0 = inactive, 1 = dormant, 2 = active.

     * @param type The connection protocol, should be one of the PDP_type values in TS 27.007

     *             section 10.1.1. For example, "IP", "IPV6", "IPV4V6", or "PPP".

     * @param ifname The network interface name.
@@ -124,7 +123,7 @@ public final class DataCallResponse implements Parcelable { 
    public int getCallId() { return mCid; }



    /**

     * @return 0 = inactive, 1 = active/physical link down, 2 = active/physical link up.

     * @return 0 = inactive, 1 = dormant, 2 = active.

     */

    public int getActive() { return mActive; }