| commit | 8c2ae7b418e31b658ffb14678098411556d7f935 | [log] [tgz] |
|---|---|---|
| author | Daniel Kim <daniel.kim@panasonic.aero> | Wed Feb 05 22:26:19 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 22:26:19 2014 +0000 |
| tree | 5629673b1f10f48dd68e75ad2e75c4c789513350 | |
| parent | 047db28da2ed1ceb56f47f17509a750058099605 [diff] | |
| parent | 69d3004ed72faeba3c46ad90643d6e78244fb6ed [diff] |
am 2f35ccfb: am 69d3004e: am 0979fd66: am e51c7a43: am 6b21c965: am 467eda57: am 14ba13d4: am 2678d5bc: cherry pick from aosp. https://android-review.googlesource.com/63805 * commit '2f35ccfbcf47cda70c21f28e410bdd3233ec8477': cherry pick from aosp. https://android-review.googlesource.com/63805
diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java index 2580dbe..7faea64 100644 --- a/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java +++ b/tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
@@ -407,6 +407,10 @@ * To pass this CTS test, a connected WiFi link is required. */ public void testWifiWatchdog() throws Exception { + if (!WifiFeature.isWifiSupported(getContext())) { + // skip the test if WiFi is not supported + return; + } // Make sure WiFi is enabled if (!mWifiManager.isWifiEnabled()) { setWifiEnabled(true);