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

Commit 212ac77c authored by Jayachandran Chinnakkannu's avatar Jayachandran Chinnakkannu Committed by android-build-merger
Browse files

Merge "Revert to previous constant value for ApnSetting.TYPE_DEFAULT." am: 54ad67f8 

am: 793a3dac

Change-Id: I4496b110d3fede92f8419e8150b6bf1c2b18fb9d
parents d4d4ed76 793a3dac

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -43334,7 +43334,7 @@ package android.telephony.data { 
    field public static final int PROTOCOL_IPV6 = 1; // 0x1

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

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

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

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

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

    field public static final int TYPE_EMERGENCY = 512; // 0x200

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

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

+2 −2
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class ApnSetting implements Parcelable { 
     */

    public static final int TYPE_ALL = ApnTypes.ALL;

    /** APN type for default data traffic. */

    public static final int TYPE_DEFAULT = ApnTypes.DEFAULT;

    public static final int TYPE_DEFAULT = ApnTypes.DEFAULT | ApnTypes.HIPRI;

    /** APN type for MMS traffic. */

    public static final int TYPE_MMS = ApnTypes.MMS;

    /** APN type for SUPL assisted GPS. */
@@ -1019,7 +1019,7 @@ public class ApnSetting implements Parcelable { 
            return false;

        }

        // DEFAULT can handle HIPRI.

        if (hasApnType(type) || (type == TYPE_HIPRI && hasApnType(TYPE_DEFAULT))) {

        if (hasApnType(type)) {

            return true;

        }

        return false;