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

Commit 0d4f48f4 authored by Amit Mahajan's avatar Amit Mahajan Committed by Gerrit Code Review
Browse files

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

parents 46a93ae8 999f2f5e

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. */