Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9165420 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Used APN type instead of APN id" 

am: 2e371c1b

Change-Id: Ib920746cb39937165aa97f79a9ac4e2fed850572
parents 3b08d8ff 2e371c1b

telephony/java/android/telephony/data/ApnSetting.java

+6 −1
Original line number Diff line number Diff line
@@ -69,7 +69,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;

telephony/java/com/android/internal/telephony/DctConstants.java

+0 −13
Original line number Diff line number Diff line
@@ -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;