Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 82f3053

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

Change-Id: I961605da35acb3978e9a25c6586b4ce4b8d711d5
This commit is contained in:
Jan Nordqvist
2016-04-14 00:29:12 +00:00
committed by android-build-merger
parent d3e93119a0 82f3053476
commit c9c4f97716
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wifi/java/android/net/wifi/WifiConfiguration.java
View File

@@ -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];
}

1
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -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: