Merge "Fix Array Index out of bounds error." into oc-dev (7e51b8b6) · Commits · e / os / android_frameworks_base

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) {