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

Commit fa987e10 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle that an operator numeric can be null" am: 5ef3c085 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1988347

Change-Id: I9cba04d0c2818766ac73ecc301028ecaa430cbb2
parents 64ef1f76 5ef3c085

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

+3 −5
Original line number Diff line number Diff line
@@ -3560,10 +3560,6 @@ public class DcTracker extends Handler { 
            mPreferredApn = null;

        } else {

            mPreferredApn = getPreferredApn();

            if (mPreferredApn != null && !mPreferredApn.getOperatorNumeric().equals(operator)) {

                mPreferredApn = null;

                setPreferredApn(-1);

            }

            if (DBG) log("createAllApnList: mPreferredApn=" + mPreferredApn);

        }
@@ -3727,7 +3723,9 @@ public class DcTracker extends Handler { 
                log("buildWaitingApns: Preferred APN:" + operator + ":"

                        + mPreferredApn.getOperatorNumeric() + ":" + mPreferredApn);

            }

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



            if (TextUtils.equals(mPreferredApn.getOperatorNumeric(), operator)

                    || mPreferredApn.getCarrierId() == mPhone.getCarrierId()) {

                if (mPreferredApn.canSupportNetworkType(

                        ServiceState.rilRadioTechnologyToNetworkType(radioTech))) {

                    // Create a new instance of ApnSetting for ENTERPRISE because each