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

Commit ed53fe62 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Ensure priority apn list is sorted" into rvc-dev am: c6518eb1 am:...

Merge "Ensure priority apn list is sorted" into rvc-dev am: c6518eb1 am: 3aaa58fd am: 17009eca

Change-Id: I64b8c4558976f5fe98c1700ef49828d3bf2087c1
parents ea74ac54 17009eca
Loading
Loading
Loading
Loading
+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;
@@ -265,13 +264,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<>();
@@ -1071,6 +1064,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);
    }