summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Monk <jmonk@google.com>2015-05-12 18:37:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-12 18:37:25 +0000
commitba6a72fd668c5396e2dc903806c915233bed43c7 (patch)
tree197e0e0eef691a803971d92deb2219c3f8775f36
parent389d5ac6ac974f171c12eb608eb8a3e2cad120f8 (diff)
parenta42ee81368f4ce469db5a787f0f3a3edd15d9931 (diff)
downloadframeworks_base-ba6a72fd668c5396e2dc903806c915233bed43c7.zip
frameworks_base-ba6a72fd668c5396e2dc903806c915233bed43c7.tar.gz
frameworks_base-ba6a72fd668c5396e2dc903806c915233bed43c7.tar.bz2
Merge "Fix crash in setup wizard" into mnc-dev
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index 28fa8fb..c4e3bd6 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@ -189,6 +189,8 @@ public class WifiTracker {
*/
public void stopTracking() {
if (mRegistered) {
+ mWorkHandler.removeMessages(WorkHandler.MSG_UPDATE_ACCESS_POINTS);
+ mWorkHandler.removeMessages(WorkHandler.MSG_UPDATE_NETWORK_INFO);
mContext.unregisterReceiver(mReceiver);
mRegistered = false;
}