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

Commit 78200dfd authored by Steve Kondik's avatar Steve Kondik
Browse files

Fix mergefail 

Change-Id: I98224af1c24a9181e512507c8ad6bfa4542c2618
parent 96fee185

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

+2 −2
Original line number Diff line number Diff line
@@ -2480,7 +2480,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
                        + mPreferredApn.numeric + ":" + mPreferredApn);

                }

                if ((mPreferredApn.numeric.equals(operator) && mPreferredApn.canHandleType(requestedApnType)) &&

                    (mPreferredApn.bearer == 0 || mPreferredApn.bearer == networkType) && 

                    (mPreferredApn.bearer == 0 || mPreferredApn.bearer == radioTech) && 

                    !apnList.contains(mPreferredApn))

                {

                    apnList.add(mPreferredApn);
@@ -2491,7 +2491,7 @@ public final class GsmDataConnectionTracker extends DataConnectionTracker { 
            // Add all the rest of the apns that can handle the requested type

            for (ApnSetting apn : mAllApns) {

                if ((apn.canHandleType(requestedApnType)) &&

                    (apn.bearer == 0 || apn.bearer == networkType || apn.bearer = radioTech) &&

                    (apn.bearer == 0 || apn.bearer == radioTech) &&

                    !apnList.contains(apn))

                {

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