Merge "Fix CTS wifi toggle test Related to bug: 31050764" into kitkat-cts-dev

1 files changed, 4 insertions, 9 deletions

diff --git a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
index 5c80fd1d70c..e9e5235220f 100644
--- a/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
+++ b/tests/tests/app/src/android/app/cts/SystemFeaturesTest.java
@@ -357,16 +357,11 @@ public class SystemFeaturesTest extends InstrumentationTestCase {
         }
         boolean enabled = mWifiManager.isWifiEnabled();
         try {
-            // WifiManager is hard-coded to return true,
-            // the case without WiFi is already handled,
-            // so this case MUST have WiFi.
-            if (mWifiManager.setWifiEnabled(true)) {
-                assertAvailable(PackageManager.FEATURE_WIFI);
-            }
+            // assert wifimanager can toggle wifi from current sate
+            assertTrue(mWifiManager.setWifiEnabled(!enabled));
+
         } finally {
-            if (!enabled) {
-                mWifiManager.setWifiEnabled(false);
-            }
+            mWifiManager.setWifiEnabled(enabled);
         }
     }