LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve merge conflicts of 8c61445473bc2842c8c9490225e97321b65d267c to oc-dev

Browse Source 
am: 934ff00f93

Change-Id: Ifac1fe67bda37bbbe5fa1d5be19f75ab51f34c8e
This commit is contained in:
Roshan Pius
2018-12-04 20:40:44 -08:00
committed by android-build-merger
parent b8f58fb9b6 934ff00f93
commit 8619176b0c
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
View File

@@ -829,10 +829,9 @@ public class WifiManagerTest extends AndroidTestCase {
TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot(); TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot();
// at this point, wifi should be off
assertFalse(mWifiManager.isWifiEnabled());
stopLocalOnlyHotspot(callback, wifiEnabled); stopLocalOnlyHotspot(callback, wifiEnabled);
// wifi should either stay on, or come back on
assertEquals(wifiEnabled, mWifiManager.isWifiEnabled()); assertEquals(wifiEnabled, mWifiManager.isWifiEnabled());
} }
@@ -844,7 +843,7 @@ public class WifiManagerTest extends AndroidTestCase {
* tethering is started. * tethering is started.
* Note: Location mode must be enabled for this test. * Note: Location mode must be enabled for this test.
*/ */
public void testSetWifiEnabledByAppDoesNotStopHotspot() { public void testSetWifiEnabledByAppDoesNotStopHotspot() throws Exception {
if (!WifiFeature.isWifiSupported(getContext())) { if (!WifiFeature.isWifiSupported(getContext())) {
// skip the test if WiFi is not supported // skip the test if WiFi is not supported
return; return;
@@ -856,15 +855,18 @@ public class WifiManagerTest extends AndroidTestCase {
boolean wifiEnabled = mWifiManager.isWifiEnabled(); boolean wifiEnabled = mWifiManager.isWifiEnabled();
if (wifiEnabled) {
// disable wifi so we have something to turn on (some devices may be able to run
// simultaneous modes)
setWifiEnabled(false);
}
TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot(); TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot();
// at this point, wifi should be off
assertFalse(mWifiManager.isWifiEnabled());
// now we should fail to turn on wifi // now we should fail to turn on wifi
assertFalse(mWifiManager.setWifiEnabled(true)); assertFalse(mWifiManager.setWifiEnabled(true));
stopLocalOnlyHotspot(callback, wifiEnabled); stopLocalOnlyHotspot(callback, wifiEnabled);
assertEquals(wifiEnabled, mWifiManager.isWifiEnabled());
} }
/** /**
@@ -888,9 +890,6 @@ public class WifiManagerTest extends AndroidTestCase {
TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot(); TestLocalOnlyHotspotCallback callback = startLocalOnlyHotspot();
// at this point, wifi should be off
assertFalse(mWifiManager.isWifiEnabled());
// now make a second request - this should fail. // now make a second request - this should fail.
TestLocalOnlyHotspotCallback callback2 = new TestLocalOnlyHotspotCallback(mLOHSLock); TestLocalOnlyHotspotCallback callback2 = new TestLocalOnlyHotspotCallback(mLOHSLock);
try { try {
@@ -899,9 +898,12 @@ public class WifiManagerTest extends AndroidTestCase {
Log.d(TAG, "Caught the IllegalStateException we expected: called startLOHS twice"); Log.d(TAG, "Caught the IllegalStateException we expected: called startLOHS twice");
caughtException = true; caughtException = true;
} }
if (!caughtException) {
// second start did not fail, should clean up the hotspot.
stopLocalOnlyHotspot(callback2, wifiEnabled);
}
assertTrue(caughtException); assertTrue(caughtException);
stopLocalOnlyHotspot(callback, wifiEnabled); stopLocalOnlyHotspot(callback, wifiEnabled);
assertEquals(wifiEnabled, mWifiManager.isWifiEnabled());
} }
} }