| commit | 2f35ccfbcf47cda70c21f28e410bdd3233ec8477 | [log] [tgz] |
|---|---|---|
| author | Daniel Kim <daniel.kim@panasonic.aero> | Wed Feb 05 22:23:17 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 22:23:17 2014 +0000 |
| tree | d52c4efe4f5fa3379014c0e961d44ade6d5e8b4c | |
| parent | 71a8a4373d209c4674ae8d4b4fe2003dc9fe9de1 [diff] | |
| parent | 10b6c755a64e7f4204293f0fdd0de2c23925d107 [diff] |
am 10b6c755: am 0979fd66: am f806c7a7: am 9a0d81ed: am 719b7c5e: am c7d7332e: am 93006d12: cherry pick from aosp. https://android-review.googlesource.com/63805 * commit '10b6c755a64e7f4204293f0fdd0de2c23925d107': cherry pick from aosp. https://android-review.googlesource.com/63805
diff --git a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java index 2580dbe..7faea64 100644 --- a/tests/tests/net/src/android/net/wifi/cts/WifiManagerTest.java +++ b/tests/tests/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);