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

Commit 9221c96a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "WifiConfiguration: Fix isEnterprise"

parents a817838e 29ce1dab
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -1407,8 +1407,10 @@ public class WifiConfiguration implements Parcelable {
     * @hide
     */
    public boolean isEnterprise() {
        return allowedKeyManagement.get(KeyMgmt.WPA_EAP) ||
            allowedKeyManagement.get(KeyMgmt.IEEE8021X);
        return (allowedKeyManagement.get(KeyMgmt.WPA_EAP)
                || allowedKeyManagement.get(KeyMgmt.IEEE8021X))
                && enterpriseConfig != null
                && enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.NONE;
    }

    @Override