WifiConfigManager: Ensure new networks are disabled

am: 0ce3ad57f3

Change-Id: If3d4840ee915aacaf0f440bf40394b6ccbd4801a

1 files changed, 5 insertions, 0 deletions

diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
index df9d4d5db..f90826deb 100644
--- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
+++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java
@@ -182,6 +182,8 @@ public class WifiConfigManagerTest {
                 mWifiConfigManager.getConfiguredNetworksWithPasswords();
         WifiConfigurationTestUtil.assertConfigurationsEqualForConfigManagerAddOrUpdate(
                 networks, retrievedNetworks);
+        // Ensure that the newly added network is disabled.
+        assertEquals(WifiConfiguration.Status.DISABLED, retrievedNetworks.get(0).status);
     }
 
     /**
@@ -2049,6 +2051,9 @@ public class WifiConfigManagerTest {
         if (configuration.getProxySettings() == IpConfiguration.ProxySettings.UNASSIGNED) {
             configuration.setProxySettings(IpConfiguration.ProxySettings.NONE);
         }
+        configuration.status = WifiConfiguration.Status.DISABLED;
+        configuration.getNetworkSelectionStatus().setNetworkSelectionStatus(
+                NetworkSelectionStatus.NETWORK_SELECTION_PERMANENTLY_DISABLED);
     }
 
     /**