diff options
| author | Pankaj Kanwar <pkanwar@google.com> | 2016-12-21 22:14:19 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-21 22:14:19 +0000 |
| commit | 5c5d7ea1d4947b85b2d64363bd1adadddf68753c (patch) | |
| tree | 2cd8f1dce135ed5b7de4ce51f448aef0618b789d | |
| parent | 14145984773a3ffb992723045dd6d829c6328b83 (diff) | |
| parent | 843ee4e8b0b3332e6f7403fe3d8346cbb991f9b8 (diff) | |
| download | android_frameworks_opt_net_wifi-5c5d7ea1d4947b85b2d64363bd1adadddf68753c.tar.gz android_frameworks_opt_net_wifi-5c5d7ea1d4947b85b2d64363bd1adadddf68753c.tar.bz2 android_frameworks_opt_net_wifi-5c5d7ea1d4947b85b2d64363bd1adadddf68753c.zip | |
Merge "DO NOT MERGE: Fix bug in WifiStateMachine for EAP-SIM." into nyc-mr2-dev
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 0bddb6c8f..45e039e80 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -5689,8 +5689,10 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss // For SIM & AKA/AKA' EAP method Only, get identity from ICC if (targetWificonfiguration != null && targetWificonfiguration.networkId == networkId - && targetWificonfiguration.allowedKeyManagement + && (targetWificonfiguration.allowedKeyManagement .get(WifiConfiguration.KeyMgmt.IEEE8021X) + || targetWificonfiguration.allowedKeyManagement + .get(WifiConfiguration.KeyMgmt.WPA_EAP)) && TelephonyUtil.isSimEapMethod(eapMethod)) { String identity = TelephonyUtil.getSimIdentity(mContext, eapMethod); if (identity != null) { @@ -5840,7 +5842,7 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss //Determine if this CONNECTION is for a user selection if (mWifiConfigManager.isLastSelectedConfiguration(config) && mWifiConfigManager.isCurrentUserProfile( - UserHandle.getUserId(config.lastConnectUid))) { + UserHandle.getUserId(config.lastConnectUid))) { lastConnectUid = config.lastConnectUid; mWifiMetrics.setConnectionEventRoamType( WifiMetricsProto.ConnectionEvent.ROAM_USER_SELECTED); |