commit a62c2d36e9013501784b7044511ae4484642d610
author Mitchell Wills <mwills@google.com> Tue Aug 09 10:36:58 2016 -0700
committer Mitchell Wills <mwills@google.com> Tue Aug 09 10:36:58 2016 -0700
tree db1363890699fb163ac32ce389ee1a805a871221
parent 673719204b0e689be876a4fa8e753609a1eef868
parent d81fcbc2cdfbbac61d62198a800c395b19ccdeab

resolve merge conflicts of d81fcbc to nyc-mr1-dev-plus-aosp

Change-Id: I8db788aefe20cc0aa8732b1401a770c49f87937c

service/java/com/android/server/wifi/WifiStateMachine.java

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index d89594f..583ba53 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -5640,8 +5640,10 @@
                     // For SIM & AKA/AKA' EAP method Only, get identity from ICC
                     if (targetWificonfiguration != null
                             && targetWificonfiguration.networkId == networkId
-                            && targetWificonfiguration.allowedKeyManagement
-                                    .get(WifiConfiguration.KeyMgmt.IEEE8021X)
+                            && (targetWificonfiguration.allowedKeyManagement
+                                    .get(WifiConfiguration.KeyMgmt.WPA_EAP)
+                            || targetWificonfiguration.allowedKeyManagement
+                                    .get(WifiConfiguration.KeyMgmt.IEEE8021X))
                             && TelephonyUtil.isSimEapMethod(eapMethod)) {
                         String identity = TelephonyUtil.getSimIdentity(mContext, eapMethod);
                         if (identity != null) {