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

am: 0d4f48f49d

Change-Id: Icc3d660c4639490adaf275a7bbc744ac1c8dfff1
This commit is contained in:
Amit Mahajan
2019-04-09 17:31:59 -07:00
committed by android-build-merger

View File

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