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

Commit f8387bce authored by Daniel Bright's avatar Daniel Bright
Browse files

Ensure priority apn list is sorted 

Test: TeleServiceTest
Bug: 141260787
Merged-In: I724d5d5ccb1a49b6eb7cfe4b6c7e6597fef49a36
Change-Id: I724d5d5ccb1a49b6eb7cfe4b6c7e6597fef49a36
parent e4e63765

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

+2 −8
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ import java.util.HashMap; 
import java.util.List;

import java.util.Map;

import java.util.Map.Entry;

import java.util.PriorityQueue;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;

import java.util.concurrent.atomic.AtomicBoolean;
@@ -264,13 +263,7 @@ public class DcTracker extends Handler { 


    /** kept in sync with mApnContexts

     * Higher numbers are higher priority and sorted so highest priority is first */

    private final PriorityQueue<ApnContext>mPrioritySortedApnContexts =

            new PriorityQueue<ApnContext>(5,

            new Comparator<ApnContext>() {

                public int compare(ApnContext c1, ApnContext c2) {

                    return c2.getPriority() - c1.getPriority();

                }

            } );

    private final ArrayList<ApnContext> mPrioritySortedApnContexts = new ArrayList<>();



    /** all APN settings applicable to the current carrier */

    private ArrayList<ApnSetting> mAllApnSettings = new ArrayList<>();
@@ -1066,6 +1059,7 @@ public class DcTracker extends Handler { 
            log("initApnContexts: apnContext=" + ApnSetting.getApnTypeString(

                    apnConfigType.getType()));

        }

        mPrioritySortedApnContexts.sort((c1, c2) -> c2.getPriority() - c1.getPriority());

        if (VDBG) log("initApnContexts: X mApnContexts=" + mApnContexts);

    }