Merge "Used APN type instead of APN id"

This commit is contained in:
TreeHugger Robot
2018-06-29 20:30:51 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 14 deletions

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;

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;