From f4b54b3d49e8e602e1df9c3f2daa2be5bc7c4a53 Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Fri, 3 Feb 2023 23:54:25 +0000
Subject: [PATCH] Fix connected wifi entry not clearing when Wifi is disabled

Connected wifi entry is represented by either
mConnectedWifiEntryPreferenceCategory or
mFirstWifiEntryPreferenceCategory, but we only clear
mConnectedWifiEntryPreferenceCategory when Wifi is disabled. Make sure
to also clear mFirstWifiEntryPreferenceCategory.

Bug: 267815756
Test: manually verify connected wifi is hidden when wifi is disabled
Change-Id: I4c30a658200f1ab90af5ce41a6531f5784a8de5d
---
 .../android/settings/network/NetworkProviderSettings.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index a2ade4740a1..e285a91090d 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -1098,10 +1098,13 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
                 .launch();
     }
 
-    /** Removes all preferences and hide the {@link #mConnectedWifiEntryPreferenceCategory}. */
+    /** Removes all preferences and hide the {@link #mConnectedWifiEntryPreferenceCategory} and
+     *  {@link #mFirstWifiEntryPreferenceCategory}. */
     private void removeConnectedWifiEntryPreference() {
         mConnectedWifiEntryPreferenceCategory.removeAll();
         mConnectedWifiEntryPreferenceCategory.setVisible(false);
+        mFirstWifiEntryPreferenceCategory.setVisible(false);
+        mFirstWifiEntryPreferenceCategory.removeAll();
     }
 
     private void removeWifiEntryPreference() {