Merge "Ensure priority apn list is sorted" into rvc-dev

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;

    /** 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<>();

            log("initApnContexts: apnContext=" + ApnSetting.getApnTypeString(

                    apnConfigType.getType()));

        }

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

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

    }