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

am: 8cf5a71ec0

* commit '8cf5a71ec0100fda09c19fc7116c1b50a0e5f096':
  ConcurrencyTest: re-enable WiFi during teardown
This commit is contained in:
Yi Kong
2015-12-31 14:43:17 +00:00
committed by android-build-merger

View File

@@ -94,8 +94,8 @@ public class ConcurrencyTest extends AndroidTestCase {
}
mContext.unregisterReceiver(mReceiver);
if (mWifiManager.isWifiEnabled()) {
assertTrue(mWifiManager.setWifiEnabled(false));
if (!mWifiManager.isWifiEnabled()) {
assertTrue(mWifiManager.setWifiEnabled(true));
Thread.sleep(DURATION);
}
super.tearDown();