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

Commit 033b8368 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge "Merge "Fix Array Index out of bounds error." into oc-dev am: 5c05814a am: 7e51b8b6"

parents 23ab426a 942a208f

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+8 −6
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ public class WifiTracker { 
    */

    private final Object mLock = new Object();



    //visible to both worker and main thread. Guarded by #mInternalAccessPoints

    //visible to both worker and main thread.

    @GuardedBy("mLock")

    private final AccessPointListenerAdapter mAccessPointListenerAdapter

            = new AccessPointListenerAdapter();
@@ -1005,12 +1006,13 @@ public class WifiTracker { 
        if (DBG) {

            Log.d(TAG, "Starting to copy AP items on the MainHandler");

        }

        synchronized (mLock) {

            if (notifyListeners) {

                notificationMap = mAccessPointListenerAdapter.mPendingNotifications.clone();

            }



            mAccessPointListenerAdapter.mPendingNotifications.clear();

        synchronized (mLock) {



            for (AccessPoint internalAccessPoint : mInternalAccessPoints) {

                AccessPoint accessPoint = oldAccessPoints.get(internalAccessPoint.mId);

                if (accessPoint == null) {