diff options
| author | 2019-04-08 14:07:45 -0700 | |
|---|---|---|
| committer | 2019-04-08 14:18:00 -0700 | |
| commit | 72ea0fd5a757ec128271f127c1af6f1627627216 (patch) | |
| tree | c9f50e1db373c9dcedc51c2ca21edfd74405be24 | |
| parent | dd07ae579c291a2b6ffe09bd576fd908eb9e5ddd (diff) | |
Make sure APN type ALL does not include types that are not wild cardable
Test: manual, atest FrameworksTelephonyTests:ApnSettingTest
Bug: 130167974
Change-Id: Ia029df91781ee125078a2b4cc4d0364919c95fd6
| -rw-r--r-- | telephony/java/android/telephony/data/ApnSetting.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index 7eea21860bce..a86fda4454d7 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. */ |