From 2678d5bcf77cd494967c1e4183168f7ea88c72bb Mon Sep 17 00:00:00 2001
From: Daniel Kim <daniel.kim@panasonic.aero>
Date: Fri, 16 Aug 2013 12:00:28 -0700
Subject: [PATCH] cherry pick from aosp.
 https://android-review.googlesource.com/63805

Fix for Wifi watchdog test when Wifi is not supported

Added a check to see if Wifi is supported like other tests in the class

Signed-off-by: Daniel Kim <daniel.kim@panasonic.aero>
---
 tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java | 4 ++++
 1 file changed, 4 insertions(+)

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 283f63b5d4..213dc1785f 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 @@ public class WifiManagerTest extends AndroidTestCase {
      * 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);