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

Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0 am: e597198f12 am: 478bb2b44d

Browse Source 
am: d74f710e25

Change-Id: I0f66eafb5129308674c0eceb4b8699bb4a32dd88
This commit is contained in:
Roshan Pius
2016-09-06 23:46:28 +00:00
committed by android-build-merger
parent c075818063 d74f710e25
commit d98aba973e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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