From 3a07ab26624e317adfa27828f675d21183c3571d Mon Sep 17 00:00:00 2001
From: Paul Stewart <pstew@google.com>
Date: Wed, 28 Sep 2016 09:51:40 -0700
Subject: SupplicantStateTracker: Add Scan State to ConnectionActiveState

Notify callers of Wi-Fi being disabled if ths happens during scanning.

Bug: 31592441
Change-Id: I89b0d2ab5a8ad0548914353af3d7cca2cfc3aad8
Test: Added CL:278088, and "adb shell dumpsys wifi reset" while scanning
---
 service/java/com/android/server/wifi/SupplicantStateTracker.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'service')

diff --git a/service/java/com/android/server/wifi/SupplicantStateTracker.java b/service/java/com/android/server/wifi/SupplicantStateTracker.java
index 4cdf8431a..ea5d9ebd5 100644
--- a/service/java/com/android/server/wifi/SupplicantStateTracker.java
+++ b/service/java/com/android/server/wifi/SupplicantStateTracker.java
@@ -99,8 +99,8 @@ public class SupplicantStateTracker extends StateMachine {
             addState(mUninitializedState, mDefaultState);
             addState(mInactiveState, mDefaultState);
             addState(mDisconnectState, mDefaultState);
-            addState(mScanState, mDefaultState);
             addState(mConnectionActiveState, mDefaultState);
+                addState(mScanState, mConnectionActiveState);
                 addState(mHandshakeState, mConnectionActiveState);
                 addState(mCompletedState, mConnectionActiveState);
                 addState(mDormantState, mConnectionActiveState);
-- 
cgit v1.2.3