Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 644610cd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "wifi: add WAPI-CERT case for enterprise netowrk"

parents 0d51f951 d2348e12

wifi/java/android/net/wifi/WifiConfiguration.java

+5 −1
Original line number Diff line number Diff line
@@ -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");