From e9868c1ba05b6b8d3be94df1e5cbd0a5d016b0a7 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Tue, 28 May 2013 19:33:48 -0700
Subject: [PATCH] Ignore outstanding delayed shutdown on restart

This was causing us to go disabled when we shouldn't
so the API being tested in the CTS would fail.  Bug
is timing dependent and hard to repro.

bug:9067887
Change-Id: I70b813bf826988d859cc29201242238f18dcf2e6
---
 wifi/java/android/net/wifi/WifiStateMachine.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/wifi/java/android/net/wifi/WifiStateMachine.java b/wifi/java/android/net/wifi/WifiStateMachine.java
index 0fc72d4d02a97..0560077e22e57 100644
--- a/wifi/java/android/net/wifi/WifiStateMachine.java
+++ b/wifi/java/android/net/wifi/WifiStateMachine.java
@@ -2355,6 +2355,7 @@ public class WifiStateMachine extends StateMachine {
         public void enter() {
             mIsRunning = true;
             mInDelayedStop = false;
+            mDelayedStopCounter++;
             updateBatteryWorkSource(null);
 
             /**