From d2348e128b94ac71108d35daeb6064934f968bc9 Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Tue, 11 Feb 2020 11:08:32 +0800 Subject: [PATCH] wifi: add WAPI-CERT case for enterprise netowrk Bug: 139257562 Test: atest FrameworksWifiApiTests Change-Id: Iec704314a082fe5c664336f3e802ef701fffc2aa --- wifi/java/android/net/wifi/WifiConfiguration.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java index a720236689d37..a7de59e6c03d1 100644 --- a/wifi/java/android/net/wifi/WifiConfiguration.java +++ b/wifi/java/android/net/wifi/WifiConfiguration.java @@ -2140,7 +2140,8 @@ public class WifiConfiguration implements Parcelable { public boolean isEnterprise() { return (allowedKeyManagement.get(KeyMgmt.WPA_EAP) || allowedKeyManagement.get(KeyMgmt.IEEE8021X) - || allowedKeyManagement.get(KeyMgmt.SUITE_B_192)) + || allowedKeyManagement.get(KeyMgmt.SUITE_B_192) + || allowedKeyManagement.get(KeyMgmt.WAPI_CERT)) && enterpriseConfig != null && enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.NONE; } @@ -2416,6 +2417,9 @@ public class WifiConfiguration implements Parcelable { if (allowedKeyManagement.get(KeyMgmt.SUITE_B_192)) { keyMgmt += KeyMgmt.strings[KeyMgmt.SUITE_B_192]; } + if (allowedKeyManagement.get(KeyMgmt.WAPI_CERT)) { + keyMgmt += KeyMgmt.strings[KeyMgmt.WAPI_CERT]; + } if (TextUtils.isEmpty(keyMgmt)) { throw new IllegalStateException("Not an EAP network");