Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Array Index out of bounds error." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-03 21:22:44 +00:00
committed by Android (Google) Code Review
parent 37963d61b2 221327dc05
commit 5c05814af4
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
View File

@@ -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");
}
if (notifyListeners) {
notificationMap = mAccessPointListenerAdapter.mPendingNotifications.clone();
}
mAccessPointListenerAdapter.mPendingNotifications.clear();
synchronized (mLock) {
if (notifyListeners) {
notificationMap = mAccessPointListenerAdapter.mPendingNotifications.clone();
}
mAccessPointListenerAdapter.mPendingNotifications.clear();
for (AccessPoint internalAccessPoint : mInternalAccessPoints) {
AccessPoint accessPoint = oldAccessPoints.get(internalAccessPoint.mId);
if (accessPoint == null) {