commit 8083b7e660038f98252ca37c65e4d530bd87d170
author JP Abgrall <jpa@google.com> Wed Apr 02 18:40:14 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 02 18:40:14 2014 +0000
tree 10981b34d924730e60253a5939bb1b9149be050d
parent 8c2ae7b418e31b658ffb14678098411556d7f935
parent 03a9e6ed450c6c5f77b201c4d95cb10cf22d3a7c

am 03a9e6ed: Merge "Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue"

* commit '03a9e6ed450c6c5f77b201c4d95cb10cf22d3a7c':
  Fix CTS android.net package testTrafficStatsForLocalhost seldom fail issue

tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java

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);