commit f570f1bdcc2423ad59841c1ad898f89ab6ac643a
author Nate Jiang <qiangjiang@google.com> Mon Aug 03 16:33:55 2020 +0000
committer Nate Jiang <qiangjiang@google.com> Mon Aug 03 16:57:21 2020 +0000
tree 3ab067869ac3e5116e4d2e94ab85fa757bc54e39
parent a03bcee78325faf5523d90ee7a7f927b49b65fb0

DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig"

This reverts commit a03bcee78325faf5523d90ee7a7f927b49b65fb0.

Reason for revert: failing test because prebuild module
Bug: 162724237

Change-Id: I530123295c3366a6955076e9d9e031282c70c486

wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java

diff --git a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
index f0839e9..16b4ad0 100644
--- a/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
+++ b/wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
@@ -62,7 +62,6 @@
         assertEquals(-1, suggestion.wifiConfiguration.priority);
         assertFalse(suggestion.isUserAllowedToManuallyConnect);
         assertTrue(suggestion.isInitialAutoJoinEnabled);
-        assertNull(suggestion.getEnterpriseConfig());
     }
 
     /**
@@ -93,7 +92,6 @@
         assertEquals(0, suggestion.wifiConfiguration.priority);
         assertFalse(suggestion.isUserAllowedToManuallyConnect);
         assertTrue(suggestion.isInitialAutoJoinEnabled);
-        assertNull(suggestion.getEnterpriseConfig());
     }
 
     /**
@@ -124,7 +122,6 @@
         assertEquals(-1, suggestion.wifiConfiguration.priority);
         assertTrue(suggestion.isUserAllowedToManuallyConnect);
         assertFalse(suggestion.isInitialAutoJoinEnabled);
-        assertNull(suggestion.getEnterpriseConfig());
     }
 
     /**
@@ -155,7 +152,6 @@
         assertEquals(-1, suggestion.wifiConfiguration.priority);
         assertTrue(suggestion.isUserAllowedToManuallyConnect);
         assertFalse(suggestion.isInitialAutoJoinEnabled);
-        assertNull(suggestion.getEnterpriseConfig());
     }
 
     /**
@@ -178,7 +174,6 @@
         assertTrue(suggestion.wifiConfiguration.requirePmf);
         assertFalse(suggestion.isUserAllowedToManuallyConnect);
         assertTrue(suggestion.isInitialAutoJoinEnabled);
-        assertNull(suggestion.getEnterpriseConfig());
     }
 
     /**
@@ -202,7 +197,6 @@
         assertTrue(suggestion.wifiConfiguration.requirePmf);
         assertTrue(suggestion.isUserAllowedToManuallyConnect);
         assertFalse(suggestion.isInitialAutoJoinEnabled);
-        assertNull(suggestion.getEnterpriseConfig());
     }
 
 
@@ -236,7 +230,6 @@
         // here.
         assertTrue(suggestion.isUserAllowedToManuallyConnect);
         assertTrue(suggestion.isInitialAutoJoinEnabled);
-        assertNotNull(suggestion.getEnterpriseConfig());
     }
 
     /**
@@ -293,7 +286,6 @@
                 .get(WifiConfiguration.GroupCipher.SMS4));
         assertEquals("\"" + TEST_PRESHARED_KEY + "\"",
                 suggestion.wifiConfiguration.preSharedKey);
-        assertNull(suggestion.getEnterpriseConfig());
     }
 
 
@@ -324,7 +316,6 @@
                 suggestion.wifiConfiguration.enterpriseConfig.getEapMethod());
         assertEquals(TEST_WAPI_CERT_SUITE,
                 suggestion.wifiConfiguration.enterpriseConfig.getWapiCertSuite());
-        assertNotNull(suggestion.getEnterpriseConfig());
     }
 
     /**
@@ -354,7 +345,6 @@
                 suggestion.wifiConfiguration.enterpriseConfig.getEapMethod());
         assertEquals("",
                 suggestion.wifiConfiguration.enterpriseConfig.getWapiCertSuite());
-        assertNotNull(suggestion.getEnterpriseConfig());
     }
 
     /**
@@ -377,7 +367,6 @@
         assertEquals(suggestion.getPasspointConfig().getMeteredOverride(),
                 WifiConfiguration.METERED_OVERRIDE_METERED);
         assertTrue(suggestion.isUserAllowedToManuallyConnect);
-        assertNull(suggestion.getEnterpriseConfig());
     }
 
     /**