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

Merge "Be more careful with mAccessPoints usage" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-06-01 19:45:22 +00:00
committed by Android (Google) Code Review
parent 1e47a8e096 1904081c62
commit 061e2bbf6b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -205,7 +205,9 @@ public class WifiTracker {
* Gets the current list of access points.
*/
public List<AccessPoint> getAccessPoints() {
return mAccessPoints;
synchronized (mAccessPoints) {
return new ArrayList<>(mAccessPoints);
}
}
public WifiManager getManager() {
@@ -230,14 +232,14 @@ public class WifiTracker {
public void dump(PrintWriter pw) {
pw.println(" - wifi tracker ------");
for (AccessPoint accessPoint : mAccessPoints) {
for (AccessPoint accessPoint : getAccessPoints()) {
pw.println(" " + accessPoint);
}
}
private void updateAccessPoints() {
// Swap the current access points into a cached list.
ArrayList<AccessPoint> cachedAccessPoints = new ArrayList<>(mAccessPoints);
List<AccessPoint> cachedAccessPoints = getAccessPoints();
ArrayList<AccessPoint> accessPoints = new ArrayList<>();
// Clear out the configs so we don't think something is saved when it isn't.
@@ -330,7 +332,7 @@ public class WifiTracker {
mMainHandler.sendEmptyMessage(MainHandler.MSG_ACCESS_POINT_CHANGED);
}
private AccessPoint getCachedOrCreate(ScanResult result, ArrayList<AccessPoint> cache) {
private AccessPoint getCachedOrCreate(ScanResult result, List<AccessPoint> cache) {
final int N = cache.size();
for (int i = 0; i < N; i++) {
if (cache.get(i).matches(result)) {
@@ -342,7 +344,7 @@ public class WifiTracker {
return new AccessPoint(mContext, result);
}
private AccessPoint getCachedOrCreate(WifiConfiguration config, ArrayList<AccessPoint> cache) {
private AccessPoint getCachedOrCreate(WifiConfiguration config, List<AccessPoint> cache) {
final int N = cache.size();
for (int i = 0; i < N; i++) {
if (cache.get(i).matches(config)) {
@@ -380,7 +382,9 @@ public class WifiTracker {
}
}
if (reorder) {
Collections.sort(mAccessPoints);
synchronized (mAccessPoints) {
Collections.sort(mAccessPoints);
}
mMainHandler.sendEmptyMessage(MainHandler.MSG_ACCESS_POINT_CHANGED);
}
}