Merge "Skip WifiManager tests if WiFi is not supported" into oc-mr1-dev

am: d6b3cb0682

Change-Id: Ib3a43925e79cba6406cad7b9bc5a93716ea9e46a
This commit is contained in:
Bjoern Johansson
2017-08-23 02:34:18 +00:00
committed by android-build-merger

View File

@@ -801,7 +801,11 @@ public class WifiManagerTest extends AndroidTestCase {
* Note: Location mode must be enabled for this test.
*/
public void testStartLocalOnlyHotspotSuccess() {
// first check that softap mode is supported by the device
if (!WifiFeature.isWifiSupported(getContext())) {
// skip the test if WiFi is not supported
return;
}
// check that softap mode is supported by the device
if (!mWifiManager.isPortableHotspotSupported()) {
return;
}
@@ -826,7 +830,11 @@ public class WifiManagerTest extends AndroidTestCase {
* Note: Location mode must be enabled for this test.
*/
public void testSetWifiEnabledByAppDoesNotStopHotspot() {
// first check that softap mode is supported by the device
if (!WifiFeature.isWifiSupported(getContext())) {
// skip the test if WiFi is not supported
return;
}
// check that softap mode is supported by the device
if (!mWifiManager.isPortableHotspotSupported()) {
return;
}
@@ -850,7 +858,11 @@ public class WifiManagerTest extends AndroidTestCase {
* Note: Location mode must be enabled for this test.
*/
public void testStartLocalOnlyHotspotSingleRequestByApps() {
// first check that softap mode is supported by the device
if (!WifiFeature.isWifiSupported(getContext())) {
// skip the test if WiFi is not supported
return;
}
// check that softap mode is supported by the device
if (!mWifiManager.isPortableHotspotSupported()) {
return;
}