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

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

Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96a am: e597198f 

am: 478bb2b4

Change-Id: I4981990a4dc3aa1dde70625b93798a2fd6ff8263
parents c49450e5 478bb2b4

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

+4 −2
Original line number Original line Diff line number Diff line
@@ -1407,8 +1407,10 @@ public class WifiConfiguration implements Parcelable { 
     * @hide

     * @hide

     */

     */

    public boolean isEnterprise() {

    public boolean isEnterprise() {

        return allowedKeyManagement.get(KeyMgmt.WPA_EAP) ||

        return (allowedKeyManagement.get(KeyMgmt.WPA_EAP)

            allowedKeyManagement.get(KeyMgmt.IEEE8021X);

                || allowedKeyManagement.get(KeyMgmt.IEEE8021X))

                && enterpriseConfig != null

                && enterpriseConfig.getEapMethod() != WifiEnterpriseConfig.Eap.NONE;

    }

    }





    @Override

    @Override