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

Commit 2d83509f authored by Jack Yu's avatar Jack Yu
Browse files

Added preferred APN logic back to IA APN selection 

The new logic is more align with the R behavior.

Fix: 185414667
Test: Manual
Merged-In: Ide3bda2b637f66aef6115139eeb971342dbcfaa9
Change-Id: Ide3bda2b637f66aef6115139eeb971342dbcfaa9
(cherry picked from commit 9ea5a8d8)
parent dbb07f6e

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

+12 −1
Original line number Diff line number Diff line
@@ -2202,12 +2202,23 @@ public class DcTracker extends Handler { 


    protected void setInitialAttachApn() {

        ApnSetting apnSetting = null;

        int preferredApnSetId = getPreferredApnSetId();

        ArrayList<ApnSetting> allApnSettings = new ArrayList<>();

        if (mPreferredApn != null) {

            // Put the preferred apn at the beginning of the list. It's okay to have a duplicate

            // when later on mAllApnSettings get added. That would not change the selection result.

            allApnSettings.add(mPreferredApn);

        }

        allApnSettings.addAll(mAllApnSettings);



        // Get the allowed APN types for initial attach. Note that if none of the APNs has the

        // allowed APN types, then the initial attach will not be performed.

        List<Integer> allowedApnTypes = getAllowedInitialAttachApnTypes();

        for (int allowedApnType : allowedApnTypes) {

            apnSetting = mAllApnSettings.stream()

            apnSetting = allApnSettings.stream()

                    .filter(apn -> apn.canHandleType(allowedApnType))

                    .filter(apn -> (apn.getApnSetId() == preferredApnSetId

                            || apn.getApnSetId() == Telephony.Carriers.MATCH_ALL_APN_SET_ID))

                    .findFirst()

                    .orElse(null);

            if (apnSetting != null) break;