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

Commit 551d2b6b authored by Amit Mahajan's avatar Amit Mahajan Committed by android-build-merger
Browse files

Merge "Make sure APN type ALL does not include types that are not wild... 

Merge "Make sure APN type ALL does not include types that are not wild cardable" into qt-dev am: 9bdb2336
am: f0b354a5

Change-Id: I74e04f049f83062a3b1a14f510aa49fa58afbd43
parents 77f6649b f0b354a5

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

+3 −2
Original line number Diff line number Diff line
@@ -78,10 +78,11 @@ public class ApnSetting implements Parcelable { 
     */

    public static final int TYPE_NONE = ApnTypes.NONE;

    /**

     * APN type for all APNs.

     * APN type for all APNs (except wild-cardable types).

     * @hide

     */

    public static final int TYPE_ALL = ApnTypes.ALL | ApnTypes.MCX;

    public static final int TYPE_ALL = ApnTypes.DEFAULT | ApnTypes.HIPRI | ApnTypes.MMS

            | ApnTypes.SUPL | ApnTypes.DUN | ApnTypes.FOTA | ApnTypes.IMS | ApnTypes.CBS;

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

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

    /** APN type for MMS traffic. */