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

This commit is contained in:
Amit Mahajan
2019-04-10 00:08:43 +00:00
committed by Gerrit Code Review

View File

@@ -78,10 +78,11 @@ public class ApnSetting implements Parcelable {
*/ */
public static final int TYPE_NONE = ApnTypes.NONE; public static final int TYPE_NONE = ApnTypes.NONE;
/** /**
* APN type for all APNs. * APN type for all APNs (except wild-cardable types).
* @hide * @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. */ /** APN type for default data traffic. */
public static final int TYPE_DEFAULT = ApnTypes.DEFAULT | ApnTypes.HIPRI; public static final int TYPE_DEFAULT = ApnTypes.DEFAULT | ApnTypes.HIPRI;
/** APN type for MMS traffic. */ /** APN type for MMS traffic. */