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

Merge "Fix wifi crash" into mnc-dev

Browse Source
This commit is contained in:
Jason Monk
2015-07-06 17:19:17 +00:00
committed by Android (Google) Code Review
parent dfd6301fa2 dbd05a98e5
commit d369d074f5
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -176,10 +176,7 @@ public class WifiTracker {
mScanner = new Scanner();
}
mScanResultCache.clear();
mSeenBssids.clear();
mScanId = 0;
mWorkHandler.sendEmptyMessage(WorkHandler.MSG_RESUME);
if (mWifiManager.isWifiEnabled()) {
mScanner.resume();
}
@@ -251,6 +248,12 @@ public class WifiTracker {
}
}
private void handleResume() {
mScanResultCache.clear();
mSeenBssids.clear();
mScanId = 0;
}
private Collection<ScanResult> fetchScanResults() {
mScanId++;
final List<ScanResult> newResults = mWifiManager.getScanResults();
@@ -544,6 +547,7 @@ public class WifiTracker {
private final class WorkHandler extends Handler {
private static final int MSG_UPDATE_ACCESS_POINTS = 0;
private static final int MSG_UPDATE_NETWORK_INFO = 1;
private static final int MSG_RESUME = 2;
public WorkHandler(Looper looper) {
super(looper);
@@ -558,6 +562,9 @@ public class WifiTracker {
case MSG_UPDATE_NETWORK_INFO:
updateNetworkInfo((NetworkInfo) msg.obj);
break;
case MSG_RESUME:
handleResume();
break;
}
}
}