commit d434b47f1edcd5901d0b810ca137ff7f79498e7d
author Roshan Pius <rpius@google.com> Fri Jan 27 23:32:26 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 27 23:32:26 2017 +0000
tree fd99c019489b1854911e0233424c49dfd0707c85
parent f7ce609edb2f62cde452cb4da9673b9b5e813a9a
parent aaaca1cfc8a1d2d8563019ac9021d87105ac2569

Merge "WifiManagerTest: |disableOthers| flag change" am: aaaca1cfc8
am: 76b4b52522

Change-Id: I8afe4aab7b34565ec5eac7ea274065d38aeb0696

tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java

diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
index dcedb18..4185189 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -218,16 +218,6 @@
         return -1;
     }
 
-    private void assertDisableOthers(WifiConfiguration wifiConfiguration, boolean disableOthers) {
-        for (WifiConfiguration w : mWifiManager.getConfiguredNetworks()) {
-            if ((!w.SSID.equals(wifiConfiguration.SSID)) && w.status != Status.CURRENT) {
-                if (disableOthers) {
-                    assertEquals(Status.DISABLED, w.status);
-                }
-            }
-        }
-    }
-
     /**
      * test point of wifiManager actions:
      * 1.reconnect
@@ -383,7 +373,6 @@
             boolean disableOthers = true;
             assertTrue(mWifiManager.enableNetwork(netId, disableOthers));
             wifiConfiguration = mWifiManager.getConfiguredNetworks().get(pos);
-            assertDisableOthers(wifiConfiguration, disableOthers);
             assertEquals(Status.ENABLED, wifiConfiguration.status);
 
             assertTrue(mWifiManager.disableNetwork(netId));