From b5ab562c128d3899456f3ba0dee1918f0eccc964 Mon Sep 17 00:00:00 2001
From: clownshen <clownshen@google.com>
Date: Fri, 29 Mar 2019 14:20:32 +0800
Subject: [PATCH] Update state as disconnected when Wi-Fi disabled

Connect button display wrong string "Connecting..." and be disabled
when Wi-Fi turned off at quick setting. Update state as disconnected
when Wi-Fi disabled to fix this issue.

Bug: 129514552
Test: manual test
Change-Id: I76a247ce0ed951357172e67221281b004df386d8
---
 .../settings/wifi/details/WifiDetailPreferenceController.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 92132e82d7c..8d90470ce10 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -271,6 +271,10 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController
             Log.d(TAG, "onWifiStateChanged(" + state + ")");
             if (mConnectingState == STATE_ENABLE_WIFI && state == WifiManager.WIFI_STATE_ENABLED) {
                 updateConnectingState(STATE_CONNECTING);
+            } else if (mConnectingState != STATE_NONE && state == WifiManager.WIFI_STATE_DISABLED) {
+                // update as disconnected once Wi-Fi disabled since may not received
+                // onConnectedChanged for this case.
+                updateConnectingState(STATE_DISCONNECTED);
             }
         }