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

Commit 235c3b63 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add PROTOCOL_UNKOWN" am: e5e9a5c3 

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



Change-Id: Id55ff9221c025a93ce0e0a73753c82d65a646320
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b548de78 e5e9a5c3

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -369,6 +369,10 @@ public class ApnSetting implements Parcelable { 
    public @interface AuthType {}

    public @interface AuthType {}





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

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

    /** Unknown protocol.

     * @hide

     */

    public static final int PROTOCOL_UNKNOWN = -1;

    /** Internet protocol. */

    /** Internet protocol. */

    public static final int PROTOCOL_IP = 0;

    public static final int PROTOCOL_IP = 0;

    /** Internet protocol, version 6. */

    /** Internet protocol, version 6. */