Merge "Clean up useless battery tips and detectors"
diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java
index a2ade47..e285a91 100644
--- a/src/com/android/settings/network/NetworkProviderSettings.java
+++ b/src/com/android/settings/network/NetworkProviderSettings.java
@@ -1098,10 +1098,13 @@
                 .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() {