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

Commit 675c99fb authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add APN type XCAP" am: 7c03a802 am: d7419344 

Change-Id: Ie74716546ce86dc951e411bff829c1f842cfc51e
parents 3bd4e386 d7419344

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -45509,6 +45509,7 @@ package android.telephony.data { 
    field public static final int TYPE_MCX = 1024; // 0x400

    field public static final int TYPE_MMS = 2; // 0x2

    field public static final int TYPE_SUPL = 4; // 0x4

    field public static final int TYPE_XCAP = 2048; // 0x800

  }















  public static class ApnSetting.Builder {

























telephony/java/android/telephony/Annotation.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -116,7 +116,8 @@ public class Annotation {













            ApnSetting.TYPE_CBS,















            ApnSetting.TYPE_IA,















            ApnSetting.TYPE_EMERGENCY,













            ApnSetting.TYPE_MCX













            ApnSetting.TYPE_MCX,













            ApnSetting.TYPE_XCAP,















    })















    @Retention(RetentionPolicy.SOURCE)















    public @interface ApnType {

































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



+8
−3




























Original line number
Diff line number
Diff line








@@ -20,7 +20,7 @@ import android.annotation.NonNull;













import android.annotation.Nullable;















import android.content.ContentValues;















import android.database.Cursor;













import android.hardware.radio.V1_4.ApnTypes;













import android.hardware.radio.V1_5.ApnTypes;















import android.net.Uri;















import android.os.Parcel;















import android.os.Parcelable;










@@ -110,6 +110,8 @@ public class ApnSetting implements Parcelable {













    public static final int TYPE_EMERGENCY = ApnTypes.EMERGENCY;















    /** APN type for MCX (Mission Critical Service) where X can be PTT/Video/Data */















    public static final int TYPE_MCX = ApnTypes.MCX;













    /** APN type for XCAP. */













    public static final int TYPE_XCAP = ApnTypes.XCAP;































    // Possible values for authentication types.















    /** No authentication type. */










@@ -198,6 +200,7 @@ public class ApnSetting implements Parcelable {













        APN_TYPE_STRING_MAP.put("ia", TYPE_IA);















        APN_TYPE_STRING_MAP.put("emergency", TYPE_EMERGENCY);















        APN_TYPE_STRING_MAP.put("mcx", TYPE_MCX);













        APN_TYPE_STRING_MAP.put("xcap", TYPE_XCAP);















        APN_TYPE_INT_MAP = new ArrayMap<Integer, String>();















        APN_TYPE_INT_MAP.put(TYPE_DEFAULT, "default");















        APN_TYPE_INT_MAP.put(TYPE_MMS, "mms");









@@ -210,6 +213,7 @@ public class ApnSetting implements Parcelable {













        APN_TYPE_INT_MAP.put(TYPE_IA, "ia");















        APN_TYPE_INT_MAP.put(TYPE_EMERGENCY, "emergency");















        APN_TYPE_INT_MAP.put(TYPE_MCX, "mcx");













        APN_TYPE_INT_MAP.put(TYPE_XCAP, "xcap");































        PROTOCOL_STRING_MAP = new ArrayMap<String, Integer>();















        PROTOCOL_STRING_MAP.put("IP", PROTOCOL_IP);










@@ -1944,8 +1948,9 @@ public class ApnSetting implements Parcelable {













         * {@link ApnSetting} built from this builder otherwise.















         */















        public ApnSetting build() {













            if ((mApnTypeBitmask & (TYPE_DEFAULT | TYPE_MMS | TYPE_SUPL | TYPE_DUN | TYPE_HIPRI |













                    TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX)) == 0













            if ((mApnTypeBitmask & (TYPE_DEFAULT | TYPE_MMS | TYPE_SUPL | TYPE_DUN | TYPE_HIPRI













                    | TYPE_FOTA | TYPE_IMS | TYPE_CBS | TYPE_IA | TYPE_EMERGENCY | TYPE_MCX













                    | TYPE_XCAP)) == 0















                || TextUtils.isEmpty(mApnName) || TextUtils.isEmpty(mEntryName)) {















                return null;















            }

































telephony/java/com/android/internal/telephony/PhoneConstants.java



+4
−1




























Original line number
Diff line number
Diff line








@@ -161,6 +161,8 @@ public class PhoneConstants {













    public static final String APN_TYPE_EMERGENCY = "emergency";















    /** APN type for Mission Critical Services */















    public static final String APN_TYPE_MCX = "mcx";













    /** APN type for XCAP */













    public static final String APN_TYPE_XCAP = "xcap";















    /** Array of all APN types */















    public static final String[] APN_TYPES = {APN_TYPE_DEFAULT,















            APN_TYPE_MMS,









@@ -172,7 +174,8 @@ public class PhoneConstants {













            APN_TYPE_CBS,















            APN_TYPE_IA,















            APN_TYPE_EMERGENCY,













            APN_TYPE_MCX













            APN_TYPE_MCX,













            APN_TYPE_XCAP,















    };































    public static final int RIL_CARD_MAX_APPS    = 8;