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

Commit c9c4f977 authored by Jan Nordqvist's avatar Jan Nordqvist Committed by android-build-merger
Browse files

Merge "Fixed incomplete OSEN config code." into nyc-dev 

am: 82f30534

* commit '82f30534':
  Fixed incomplete OSEN config code.

Change-Id: I961605da35acb3978e9a25c6586b4ce4b8d711d5
parents d3e93119 82f30534

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

+3 −0
Original line number Diff line number Diff line
@@ -1636,6 +1636,9 @@ public class WifiConfiguration implements Parcelable { 
            if (allowedKeyManagement.get(KeyMgmt.WPA_EAP)) {

                keyMgmt = KeyMgmt.strings[KeyMgmt.WPA_EAP];

            }

            if (allowedKeyManagement.get(KeyMgmt.OSEN)) {

                keyMgmt = KeyMgmt.strings[KeyMgmt.OSEN];

            }

            if (allowedKeyManagement.get(KeyMgmt.IEEE8021X)) {

                keyMgmt += KeyMgmt.strings[KeyMgmt.IEEE8021X];

            }

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

+1 −0
Original line number Diff line number Diff line
@@ -437,6 +437,7 @@ public class WifiEnterpriseConfig implements Parcelable { 
        switch (eapMethod) {

            /** Valid methods */

            case Eap.TLS:

            case Eap.UNAUTH_TLS:

                setPhase2Method(Phase2.NONE);

                /* fall through */

            case Eap.PEAP: