From f570f1bdcc2423ad59841c1ad898f89ab6ac643a Mon Sep 17 00:00:00 2001
From: Nate Jiang <qiangjiang@google.com>
Date: Mon, 3 Aug 2020 16:33:55 +0000
Subject: [PATCH] DO NOT MERGE Revert "[NetworkSuggestion] Fix
 getEnterpriseConfig"

This reverts commit a03bcee78325faf5523d90ee7a7f927b49b65fb0.

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

Change-Id: I530123295c3366a6955076e9d9e031282c70c486
---
 .../android/net/wifi/WifiNetworkSuggestionTest.java   | 11 -----------
 1 file changed, 11 deletions(-)

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