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

Commit 7c178b4f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Change to not share ApnSetting objects between DEFAULT and ENTERPRISE"... 

Merge "Change to not share ApnSetting objects between DEFAULT and ENTERPRISE" into sc-dev am: a4f3f179

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

Change-Id: I1225a5c37626897097c04130e1d10d91a5ac926e
parents 9fe57c6d a4f3f179

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

+18 −2
Original line number Diff line number Diff line
@@ -3681,7 +3681,15 @@ public class DcTracker extends Handler { 
            if (mPreferredApn.getOperatorNumeric().equals(operator)) {

                if (mPreferredApn.canSupportNetworkType(

                        ServiceState.rilRadioTechnologyToNetworkType(radioTech))) {

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

                    // DataConnection should have its own ApnSetting. ENTERPRISE uses the same

                    // APN as DEFAULT but is a separate DataConnection

                    if (ApnSetting.getApnTypesBitmaskFromString(requestedApnType)

                            == ApnSetting.TYPE_ENTERPRISE) {

                        apnList.add(ApnSetting.makeApnSetting(mPreferredApn));

                    } else {

                        apnList.add(mPreferredApn);

                    }

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

                    return apnList;

                }
@@ -3700,7 +3708,15 @@ public class DcTracker extends Handler { 
                    if (apn.getApnSetId() == Telephony.Carriers.MATCH_ALL_APN_SET_ID

                            || preferredApnSetId == apn.getApnSetId()) {

                        if (VDBG) log("buildWaitingApns: adding apn=" + apn);

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

                        // DataConnection should have its own ApnSetting. ENTERPRISE uses the same

                        // APN as DEFAULT but is a separate DataConnection

                        if (ApnSetting.getApnTypesBitmaskFromString(requestedApnType)

                                == ApnSetting.TYPE_ENTERPRISE) {

                            apnList.add(ApnSetting.makeApnSetting(apn));

                        } else {

                            apnList.add(apn);

                        }

                    } else {

                        log("buildWaitingApns: APN set id " + apn.getApnSetId()

                                + " does not match the preferred set id " + preferredApnSetId);