From ca18cb02b60a7a06510fcc40d9b0922978420788 Mon Sep 17 00:00:00 2001
From: jgkim <jgkim2@humaxdigital.com>
Date: Fri, 6 Dec 2019 15:46:41 +0900
Subject: [PATCH] CtsNetTestCases: Fix issues in
 android.net.wifi.cts.WifiEnterpriseConfigTest

1.android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
2.android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
3.android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters

Bug:143000258
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testAddEapNetwork
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testEnterpriseConfigDoesNotPrintPassword
Test: run cts-on-gsi -m CtsNetTestCases-t android.net.wifi.cts.WifiEnterpriseConfigTest#testSettersAndGetters
Change-Id: Iaed949693c8ac8ce67dbde6acb622f90f0e638da
---
 .../src/android/net/wifi/cts/WifiEnterpriseConfigTest.java  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/cts/net/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java b/tests/cts/net/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java
index b592c105f7..e4c4b006dc 100644
--- a/tests/cts/net/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java
+++ b/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";