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

Merge "[NetworkSuggestion] Fix getEnterpriseConfig" into rvc-qpr-dev am: 66909a0d5d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12265213

Change-Id: Iadd7252c58215fd9f2ed5ffd8fbe7097c76b6ec9
This commit is contained in:
Nate Jiang
2020-07-31 16:18:33 +00:00
committed by Automerger Merge Worker
parent 1e637f36a4 66909a0d5d
commit 0569a540b2
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/WifiNetworkSuggestion.java
View File

@@ -943,6 +943,9 @@ public final class WifiNetworkSuggestion implements Parcelable {
*/ */
@Nullable @Nullable
public WifiEnterpriseConfig getEnterpriseConfig() { public WifiEnterpriseConfig getEnterpriseConfig() {
if (!wifiConfiguration.isEnterprise()) {
return null;
}
return wifiConfiguration.enterpriseConfig; return wifiConfiguration.enterpriseConfig;
} }

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

@@ -62,6 +62,7 @@ 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());
} }
/** /**
@@ -92,6 +93,7 @@ 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());
} }
/** /**
@@ -122,6 +124,7 @@ 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());
} }
/** /**
@@ -152,6 +155,7 @@ 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());
} }
/** /**
@@ -174,6 +178,7 @@ 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());
} }
/** /**
@@ -197,6 +202,7 @@ 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());
} }
@@ -230,6 +236,7 @@ public class WifiNetworkSuggestionTest {
// here. // here.
assertTrue(suggestion.isUserAllowedToManuallyConnect); assertTrue(suggestion.isUserAllowedToManuallyConnect);
assertTrue(suggestion.isInitialAutoJoinEnabled); assertTrue(suggestion.isInitialAutoJoinEnabled);
assertNotNull(suggestion.getEnterpriseConfig());
} }
/** /**
@@ -286,6 +293,7 @@ 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());
} }
@@ -316,6 +324,7 @@ 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());
} }
/** /**
@@ -345,6 +354,7 @@ public class WifiNetworkSuggestionTest {
suggestion.wifiConfiguration.enterpriseConfig.getEapMethod()); suggestion.wifiConfiguration.enterpriseConfig.getEapMethod());
assertEquals("", assertEquals("",
suggestion.wifiConfiguration.enterpriseConfig.getWapiCertSuite()); suggestion.wifiConfiguration.enterpriseConfig.getWapiCertSuite());
assertNotNull(suggestion.getEnterpriseConfig());
} }
/** /**
@@ -367,6 +377,7 @@ 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());
} }
/** /**