Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Used APN type instead of APN id" am: 2e371c1b5a

Browse Source 
am: a916542011

Change-Id: I58bb518a7720e65edd73d93b5775fa4cc40b41db
This commit is contained in:
Jack Yu
2018-06-29 18:40:06 -07:00
committed by android-build-merger
parent dcfa685cad a916542011
commit 8f76322f75
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
telephony/java/android/telephony/data/ApnSetting.java
View File

@@ -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;

13
telephony/java/com/android/internal/telephony/DctConstants.java
View File

@@ -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;