From 999f2f5e38fe79d7b2d01ab5c0fe2b4117ef3f23 Mon Sep 17 00:00:00 2001 From: Amit Mahajan Date: Mon, 8 Apr 2019 14:07:45 -0700 Subject: [PATCH] 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 72ea0fd5a757ec128271f127c1af6f1627627216) --- telephony/java/android/telephony/data/ApnSetting.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 4b9abc1e6f334..4a7585db07408 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -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. */