From a42ee81368f4ce469db5a787f0f3a3edd15d9931 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 12 May 2015 14:20:25 -0400
Subject: [PATCH] Fix crash in setup wizard

Clear out any unhandled worker messages before stopping tracking.

Bug: 21048197
Change-Id: I3792215a1e7799bdb93587cd7158c4d5d86de348
---
 .../src/com/android/settingslib/wifi/WifiTracker.java           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index 28fa8fba5b361..c4e3bd6129e93 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;
         }