From bfa6635c306f1124850e74cce513447926861199 Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Mon, 25 Jun 2018 17:40:02 -0700 Subject: [PATCH] Used APN type instead of APN id APN id is similar to ApnSetting.ApnType. We can just use the apn type. No need to use APN id anymore. Test: Telephony sanity tests + unit tests Bug: 77511388 Merged-In: If41845604ea14f36272262da110d682eea0d5451 Change-Id: If41845604ea14f36272262da110d682eea0d5451 (cherry picked from commit f42d06010a522b0d519df1a2ce9fa5ba3aefb51f) --- .../java/android/telephony/data/ApnSetting.java | 7 ++++++- .../android/internal/telephony/DctConstants.java | 13 ------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/telephony/java/android/telephony/data/ApnSetting.java b/telephony/java/android/telephony/data/ApnSetting.java index bb181e680d86e..296e1de1b1356 100644 --- a/telephony/java/android/telephony/data/ApnSetting.java +++ b/telephony/java/android/telephony/data/ApnSetting.java @@ -70,7 +70,12 @@ public class ApnSetting implements Parcelable { private static final String UNSPECIFIED_STRING = ""; /** - * All APN types. + * APN type for none. Should only be used for initialization. + * @hide + */ + public static final int TYPE_NONE = ApnTypes.NONE; + /** + * APN type for all APNs. * @hide */ public static final int TYPE_ALL = ApnTypes.ALL; diff --git a/telephony/java/com/android/internal/telephony/DctConstants.java b/telephony/java/com/android/internal/telephony/DctConstants.java index e546917027760..86cb1b74abd34 100644 --- a/telephony/java/com/android/internal/telephony/DctConstants.java +++ b/telephony/java/com/android/internal/telephony/DctConstants.java @@ -103,19 +103,6 @@ public class DctConstants { /***** Constants *****/ - public static final int APN_INVALID_ID = -1; - public static final int APN_DEFAULT_ID = 0; - public static final int APN_MMS_ID = 1; - public static final int APN_SUPL_ID = 2; - public static final int APN_DUN_ID = 3; - public static final int APN_HIPRI_ID = 4; - public static final int APN_IMS_ID = 5; - public static final int APN_FOTA_ID = 6; - public static final int APN_CBS_ID = 7; - public static final int APN_IA_ID = 8; - public static final int APN_EMERGENCY_ID = 9; - public static final int APN_NUM_TYPES = 10; - public static final int INVALID = -1; public static final int DISABLED = 0; public static final int ENABLED = 1;