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

Commit cd1ce182 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 cardable" 

am: 0d4f48f4

Change-Id: Icc3d660c4639490adaf275a7bbc744ac1c8dfff1
parents 50a1a19f 0d4f48f4

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