Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE Revert "[NetworkSuggestion] Fix getEnterpriseConfig"" into rvc-qpr-dev

Browse Source
This commit is contained in:
Nate Jiang
2020-08-03 19:46:33 +00:00
committed by Android (Google) Code Review
parent 786165bae0 f570f1bdcc
commit 2bbbe141ef
1 changed files with 0 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
wifi/tests/src/android/net/wifi/WifiNetworkSuggestionTest.java
View File

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