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

Commit 5e2ede62 authored by Amit Mahajan's avatar Amit Mahajan
Browse files

Add APN context for TYPE_MOBILE_MCX. 

Test: none
Bug: 124447962
Change-Id: I811f177ff8108aa47e57fe429d91c1a9d0f9c226
parent af64bf9d

src/java/com/android/internal/telephony/dataconnection/DcTracker.java

+55 −33
Original line number Diff line number Diff line
@@ -128,6 +128,25 @@ public class DcTracker extends Handler { 
    private static final boolean VDBG_STALL = false; // STOPSHIP if true

    private static final boolean RADIO_TESTS = false;



    /**

     * These constants exist here because ConnectivityManager.TYPE_xxx constants are deprecated and

     * new ones will not be added (for instance NETWORK_TYPE_MCX below).

     * For backward compatibility, the values here need to be the same as

     * ConnectivityManager.TYPE_xxx because networkAttributes overlay uses those values.

     */

    private static final int NETWORK_TYPE_DEFAULT = ConnectivityManager.TYPE_MOBILE;

    private static final int NETWORK_TYPE_MMS = ConnectivityManager.TYPE_MOBILE_MMS;

    private static final int NETWORK_TYPE_SUPL = ConnectivityManager.TYPE_MOBILE_SUPL;

    private static final int NETWORK_TYPE_DUN = ConnectivityManager.TYPE_MOBILE_DUN;

    private static final int NETWORK_TYPE_HIPRI = ConnectivityManager.TYPE_MOBILE_HIPRI;

    private static final int NETWORK_TYPE_FOTA = ConnectivityManager.TYPE_MOBILE_FOTA;

    private static final int NETWORK_TYPE_IMS = ConnectivityManager.TYPE_MOBILE_IMS;

    private static final int NETWORK_TYPE_CBS = ConnectivityManager.TYPE_MOBILE_CBS;

    private static final int NETWORK_TYPE_IA = ConnectivityManager.TYPE_MOBILE_IA;

    private static final int NETWORK_TYPE_EMERGENCY = ConnectivityManager.TYPE_MOBILE_EMERGENCY;

    private static final int NETWORK_TYPE_MCX = 1001;  // far away from ConnectivityManager.TYPE_xxx

                                                       // constants as MCX isn't defined there.



    @IntDef(value = {

            REQUEST_TYPE_NORMAL,

            REQUEST_TYPE_HANDOVER,
@@ -972,36 +991,39 @@ public class DcTracker extends Handler { 
            ApnContext apnContext = null;



            switch (networkConfig.type) {

            case ConnectivityManager.TYPE_MOBILE:

                case NETWORK_TYPE_DEFAULT:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_DEFAULT, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_MMS:

                case NETWORK_TYPE_MMS:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_MMS, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_SUPL:

                case NETWORK_TYPE_SUPL:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_SUPL, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_DUN:

                case NETWORK_TYPE_DUN:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_DUN, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_HIPRI:

                case NETWORK_TYPE_HIPRI:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_HIPRI, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_FOTA:

                case NETWORK_TYPE_FOTA:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_FOTA, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_IMS:

                case NETWORK_TYPE_IMS:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_IMS, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_CBS:

                case NETWORK_TYPE_CBS:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_CBS, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_IA:

                case NETWORK_TYPE_IA:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_IA, networkConfig);

                    break;

            case ConnectivityManager.TYPE_MOBILE_EMERGENCY:

                case NETWORK_TYPE_EMERGENCY:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_EMERGENCY, networkConfig);

                    break;

                case NETWORK_TYPE_MCX:

                    apnContext = addApnContext(PhoneConstants.APN_TYPE_MCX, networkConfig);

                    break;

                default:

                    log("initApnContexts: skipping unknown type=" + networkConfig.type);

                    continue;