diff options
| author | pkanwar <pkanwar@google.com> | 2016-12-20 14:24:27 -0800 |
|---|---|---|
| committer | Pankaj Kanwar <pkanwar@google.com> | 2016-12-21 17:05:05 +0000 |
| commit | 843ee4e8b0b3332e6f7403fe3d8346cbb991f9b8 (patch) | |
| tree | 161a0ac074ad08599e4b0d2d13f5f3bb460a4ca5 | |
| parent | 04600af92070f72e6fe2d6d54fa65d2eca33a464 (diff) | |
| download | android_frameworks_opt_net_wifi-843ee4e8b0b3332e6f7403fe3d8346cbb991f9b8.tar.gz android_frameworks_opt_net_wifi-843ee4e8b0b3332e6f7403fe3d8346cbb991f9b8.tar.bz2 android_frameworks_opt_net_wifi-843ee4e8b0b3332e6f7403fe3d8346cbb991f9b8.zip | |
DO NOT MERGE: Fix bug in WifiStateMachine for EAP-SIM.
WifiStateMachine was not looking for the right keys. Add condition to
look for WPA_EAP, in addition to IEEE8021X.
Bug:31003437
Change-Id: Icc72644de77927a23c2ad5a4fbea640ba392e9ae
| -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); |