Merge "CtsNetTestCases: Fix issues in android.net.wifi.cts.WifiEnterpriseConfigTest" am: bec47acfaa

Change-Id: Ia3ce4c1e115f74c9771e9b49af633a2d278edaf5
2020-01-31 16:06:13 +00:00
parent 0dd6e6cc37 bec47acfaa
commit 26461e5ea8
1 changed files with 6 additions and 0 deletions
--- 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";