diff options
author | Jason Monk <jmonk@google.com> | 2015-07-06 17:19:17 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-06 17:19:19 +0000 |
commit | d369d074f5bdbcc9229bf52e12f3bde025cf41cd (patch) | |
tree | 997cf6e1dcd3fcb079c8d18d479dab240e687c1a /packages | |
parent | dfd6301fa2570ae5b012dd964847531bdfdb3f4b (diff) | |
parent | dbd05a98e5ed8cd1a4678790df507d9741da5ba2 (diff) | |
download | frameworks_base-d369d074f5bdbcc9229bf52e12f3bde025cf41cd.zip frameworks_base-d369d074f5bdbcc9229bf52e12f3bde025cf41cd.tar.gz frameworks_base-d369d074f5bdbcc9229bf52e12f3bde025cf41cd.tar.bz2 |
Merge "Fix wifi crash" into mnc-dev
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index ef08e19..33f993e 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -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; } } } |