summaryrefslogtreecommitdiffstats
path: root/service
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2016-04-04 18:58:22 +0100
committerRicardo Cerqueira <ricardo@cyngn.com>2016-04-04 19:01:01 +0100
commite857544b876a28a4895f20b495a9c0484c1bbcde (patch)
tree3e635380889b6e425104ceeb95f5ec2af8a1ce1f /service
parent8afb31bb0e93107642b96d4380fedcf832688e95 (diff)
downloadandroid_frameworks_opt_net_wifi-e857544b876a28a4895f20b495a9c0484c1bbcde.tar.gz
android_frameworks_opt_net_wifi-e857544b876a28a4895f20b495a9c0484c1bbcde.tar.bz2
android_frameworks_opt_net_wifi-e857544b876a28a4895f20b495a9c0484c1bbcde.zip
eap-sim: Unbreak the standard non-proxied flow for multi-challenge requests
Change I8eb8edde7a8bb310d73d1b3cc8bc060647e2375f is intended to deal with breakage when getting an invalid reply from the RIL for SIM authentication. Unfortunately, it also breaks the loop and returns the value at the first successful reply, instead of concatenating all the challenge replies like wpa_supplicant expects it to. Change-Id: I7d1007a55e6dc5ee0dca48e16952e34562b1ff24
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 8afbad3c5..4f3d432a5 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -10511,15 +10511,16 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
sb.append(":" + kc + ":" + sres);
logv("kc:" + kc + " sres:" + sres);
- String response = sb.toString();
- logv("Supplicant Response -" + response);
- mWifiNative.simAuthResponse(requestData.networkId, "GSM-AUTH", response);
} else {
loge("bad response - " + tmResponse);
mWifiNative.simAuthFailedResponse(requestData.networkId);
}
}
+ String response = sb.toString();
+ logv("Supplicant Response -" + response);
+ mWifiNative.simAuthResponse(requestData.networkId, "GSM-AUTH", response);
+
} else {
loge("could not get telephony manager");
mWifiNative.simAuthFailedResponse(requestData.networkId);