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

Commit 478bb2b4 authored by Roshan Pius's avatar Roshan Pius Committed by android-build-merger
Browse files

Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96a 

am: e597198f

Change-Id: I3a1f7808a4ce44f96753cb875ff914985151b208
parents e65bf6d1 e597198f

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

+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