| commit | dcc684355675815a4c9c1cf3bc39cea41c7535ea | [log] [tgz] |
|---|---|---|
| author | Daniel Kim <daniel.kim@panasonic.aero> | Wed Feb 05 22:32:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 05 22:32:35 2014 +0000 |
| tree | 97094e54fb37b90911e4e9965e39cd76b52bf38a | |
| parent | 39b7e8e620186677b2925e96cad967c94cd016ee [diff] | |
| parent | 8c2ae7b418e31b658ffb14678098411556d7f935 [diff] |
am 8c2ae7b4: 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 '8c2ae7b418e31b658ffb14678098411556d7f935': 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);