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

Commit 7d551361 authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix our interpretation of apn setting's bearer. 

Between ICS and JB we changed it to use TelephonyManager's network type
enumeration.  This changes it back to represent the RIL's radio
technology.  The only diff between the two is 13 and 14 are swapped,
so the change was causing problems with LTE and eHRPD.

bug:6830908
Change-Id: I85a7c8037f370f368e5cbf6dc2c9395c6889b541
parent c80f72f7

telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java

+3 −3
Original line number Diff line number Diff line
@@ -2374,7 +2374,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
        }



        String operator = mPhone.mIccRecords.getOperatorNumeric();

        int networkType = mPhone.getServiceState().getNetworkType();

        int radioTech = mPhone.getServiceState().getRilRadioTechnology();



        if (canSetPreferApn && mPreferredApn != null &&

                mPreferredApn.canHandleType(requestedApnType)) {
@@ -2383,7 +2383,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
                        + mPreferredApn.numeric + ":" + mPreferredApn);

            }

            if (mPreferredApn.numeric.equals(operator)) {

                if (mPreferredApn.bearer == 0 || mPreferredApn.bearer == networkType) {

                if (mPreferredApn.bearer == 0 || mPreferredApn.bearer == radioTech) {

                    apnList.add(mPreferredApn);

                    if (DBG) log("buildWaitingApns: X added preferred apnList=" + apnList);

                    return apnList;
@@ -2401,7 +2401,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
        if (mAllApns != null) {

            for (ApnSetting apn : mAllApns) {

                if (apn.canHandleType(requestedApnType)) {

                    if (apn.bearer == 0 || apn.bearer == networkType) {

                    if (apn.bearer == 0 || apn.bearer == radioTech) {

                        if (DBG) log("apn info : " +apn.toString());

                        apnList.add(apn);

                    }