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

Commit 999f2f5e authored by Amit Mahajan's avatar Amit Mahajan
Browse files

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

Test: manual, atest FrameworksTelephonyTests:ApnSettingTest
Bug: 130167974
Merged-in: Ia029df91781ee125078a2b4cc4d0364919c95fd6
Change-Id: Ia029df91781ee125078a2b4cc4d0364919c95fd6
(cherry picked from commit 72ea0fd5)
parent 2e96d3f5

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