WifiConfigManager: Retrieve all hidden networks
The current logic does not retrieve hidden networks if they're disabled.
This causes us to not scan for hidden saved networks which were disabled
due to authentication failures. And the user will not be able to see such
hidden networks in their wifi preferences window.
Bug: 68289406
Test: Unit tests
Change-Id: If66448d151f74500f45b44856546d0a3d8c8e897
diff --git a/service/java/com/android/server/wifi/WifiConfigManager.java b/service/java/com/android/server/wifi/WifiConfigManager.java
index b610bd9..0c33b89 100644
--- a/service/java/com/android/server/wifi/WifiConfigManager.java
+++ b/service/java/com/android/server/wifi/WifiConfigManager.java
@@ -2372,8 +2372,7 @@
Iterator<WifiConfiguration> iter = networks.iterator();
while (iter.hasNext()) {
WifiConfiguration config = iter.next();
- if (!config.hiddenSSID ||
- config.getNetworkSelectionStatus().isNetworkPermanentlyDisabled()) {
+ if (!config.hiddenSSID) {
iter.remove();
}
}
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
index 5af06f7..3485925 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
@@ -2890,11 +2890,6 @@
verifyAddNetworkToWifiConfigManager(network2);
verifyAddNetworkToWifiConfigManager(network3);
- // Enable all of them.
- assertTrue(mWifiConfigManager.enableNetwork(network1.networkId, false, TEST_CREATOR_UID));
- assertTrue(mWifiConfigManager.enableNetwork(network2.networkId, false, TEST_CREATOR_UID));
- assertTrue(mWifiConfigManager.enableNetwork(network3.networkId, false, TEST_CREATOR_UID));
-
// Now set scan results in 2 of them to set the corresponding
// {@link NetworkSelectionStatus#mSeenInLastQualifiedNetworkSelection} field.
assertTrue(mWifiConfigManager.setNetworkCandidateScanResult(
@@ -2913,15 +2908,6 @@
assertEquals(network3.SSID, hiddenNetworks.get(0).ssid);
assertEquals(network1.SSID, hiddenNetworks.get(1).ssid);
assertEquals(network2.SSID, hiddenNetworks.get(2).ssid);
-
- // Now permanently disable |network3|. This should remove network 3 from the list.
- assertTrue(mWifiConfigManager.disableNetwork(network3.networkId, TEST_CREATOR_UID));
-
- // Retrieve the hidden network list again & verify the order of the networks returned.
- hiddenNetworks = mWifiConfigManager.retrieveHiddenNetworkList();
- assertEquals(2, hiddenNetworks.size());
- assertEquals(network1.SSID, hiddenNetworks.get(0).ssid);
- assertEquals(network2.SSID, hiddenNetworks.get(1).ssid);
}
/**