commit 074b8b0de5e92699b5ad11f7a237df892710d518
author Yi Kong <yikong@google.com> Thu Dec 31 14:43:17 2015 +0000
committer android-build-merger <android-build-merger@google.com> Thu Dec 31 14:43:17 2015 +0000
tree dd4ffe36fde904af5d24acc31bb88ba1644ae1c4
parent b64304dd6255cf5efa5a2144d84a69520b251464
parent a49620ff080258ccc6b88d7c3b2d28e3138ba995

Merge "ConcurrencyTest: re-enable WiFi during teardown" am: a49620ff08
am: 8cf5a71ec0

* commit '8cf5a71ec0100fda09c19fc7116c1b50a0e5f096':
  ConcurrencyTest: re-enable WiFi during teardown

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

diff --git a/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java b/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
index 5accd77..343c1e6 100644
--- a/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
+++ b/tests/cts/net/src/android/net/wifi/cts/ConcurrencyTest.java
@@ -94,8 +94,8 @@
         }
         mContext.unregisterReceiver(mReceiver);
 
-        if (mWifiManager.isWifiEnabled()) {
-            assertTrue(mWifiManager.setWifiEnabled(false));
+        if (!mWifiManager.isWifiEnabled()) {
+            assertTrue(mWifiManager.setWifiEnabled(true));
             Thread.sleep(DURATION);
         }
         super.tearDown();