From fbbf6a46cd09f4c026b2537d23f55b78648adc15 Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Tue, 26 Oct 2010 22:23:16 -0700
Subject: [PATCH] DO NOT MERGE fix runstate race condition

Bug: 3107829
Change-Id: I94312ad10975af24660455c3aace97634f06f3e1
---
 wifi/java/android/net/wifi/WifiStateTracker.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/wifi/java/android/net/wifi/WifiStateTracker.java b/wifi/java/android/net/wifi/WifiStateTracker.java
index 8028fe71afa3f..a0e588d3f33d4 100644
--- a/wifi/java/android/net/wifi/WifiStateTracker.java
+++ b/wifi/java/android/net/wifi/WifiStateTracker.java
@@ -601,8 +601,6 @@ public class WifiStateTracker extends NetworkStateTracker {
      * Send the tracker a notification that the Wi-Fi driver has been stopped.
      */
     void notifyDriverStopped() {
-        mRunState = RUN_STATE_STOPPED;
-
         // Send a driver stopped message to our handler
         Message.obtain(this, EVENT_DRIVER_STATE_CHANGED, DRIVER_STOPPED, 0).sendToTarget();
     }
@@ -1301,6 +1299,9 @@ public class WifiStateTracker extends NetworkStateTracker {
                         }
                     }
                     break;
+                case DRIVER_STOPPED:
+                    mRunState = RUN_STATE_STOPPED;
+                    break;
                 case DRIVER_HUNG:
                     Log.e(TAG, "Wifi Driver reports HUNG - reloading.");
                     /**