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

Commit aaf53c0f authored by Chris Holmes's avatar Chris Holmes Committed by Gerrit Code Review
Browse files

Revert "DCTracker: upgrade stubbed apn to Qcril Standard." 

This reverts commit 01058445.

Breaks CDMA Data on VZW (d2 and jf) When booted with Wifi on.

If Wifi is turned off, data remains disconnected.

Change-Id: I196f9be87840e6d00e8ea3962dbf35f254122fec
parent 01058445

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

+5 −10
Original line number Diff line number Diff line
@@ -1205,14 +1205,11 @@ public class DcTracker extends DcTrackerBase { 
        if (apnSetting == null) {

            if(PhoneConstants.PHONE_TYPE_CDMA==mPhone.getPhoneType()) {

                String[] mDunApnTypes = { PhoneConstants.APN_TYPE_DUN };

                final int mDefaultApnId = DctConstants.APN_DEFAULT_ID;

                final String[] mDefaultApnTypes = {

                    PhoneConstants.APN_TYPE_DEFAULT,

                    PhoneConstants.APN_TYPE_MMS,

                    PhoneConstants.APN_TYPE_SUPL,

                    PhoneConstants.APN_TYPE_HIPRI,

                    PhoneConstants.APN_TYPE_FOTA,

                    PhoneConstants.APN_TYPE_IMS,

                    PhoneConstants.APN_TYPE_CBS };

                    PhoneConstants.APN_TYPE_HIPRI };

                String[] types;

                int apnId;

                if (mRequestedApnType.equals(PhoneConstants.APN_TYPE_DUN)) {
@@ -1220,12 +1217,10 @@ public class DcTracker extends DcTrackerBase { 
                    apnId = DctConstants.APN_DUN_ID;

                } else {

                    types = mDefaultApnTypes;

                    apnId = DctConstants.APN_DEFAULT_ID;

                    apnId = mDefaultApnId;

                }

                apnSetting = new ApnSetting(apnId, getOperatorNumeric(), null, null,

                                            null, null, null, null, null, null, null,

                                            RILConstants.SETUP_DATA_AUTH_PAP_CHAP, types,

                                            PROPERTY_CDMA_IPPROTOCOL, PROPERTY_CDMA_ROAMING_IPPROTOCOL, true, 0);

                apnSetting = new ApnSetting(apnId, "", "", "", "", "", "", "", "", "",

                                            "", 0, types, "IP", "IP", true, 0);

                if (DBG) log("setupData: CDMA detected and apnSetting == null, use stubbed CDMA APN setting= " + apnSetting);

            } else {

                if (DBG) log("setupData: return for no apn found!");