Merge "CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest" am: bec47acfaa am: 26461e5ea8 am: 978a9bc103

Change-Id: Ib14926206e8c6e5d446e5a70002ae46ee1677370

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

@@ -687,6 +687,9 @@ public class WifiEnterpriseConfigTest extends AndroidTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        if(!hasWifi()) {
+            return;
+        }
         mWifiManager = (WifiManager) mContext
                 .getSystemService(Context.WIFI_SERVICE);
         assertNotNull(mWifiManager);
@@ -778,6 +781,9 @@ public class WifiEnterpriseConfigTest extends AndroidTestCase {
     }
 
     public void testEnterpriseConfigDoesNotPrintPassword() {
+        if(!hasWifi()) {
+            return;
+        }
         WifiEnterpriseConfig enterpriseConfig = new WifiEnterpriseConfig();
         final String identity = "IdentityIsOkayToBeDisplayedHere";
         final String password = "PasswordIsNotOkayToBeDisplayedHere";