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

Merge "WifiConfiguration: Fix isEnterprise" am: 9221c96ae0

Browse Source 
am: e597198f12

Change-Id: I3a1f7808a4ce44f96753cb875ff914985151b208
This commit is contained in:
Roshan Pius
2016-09-06 23:12:01 +00:00
committed by android-build-merger
parent e65bf6d173 e597198f12
commit 478bb2b44d
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