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

Merge "Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime" into nyc-mr1-dev

Browse Source
This commit is contained in:
Mitchell Wills
2016-06-24 20:24:12 +00:00
committed by Android (Google) Code Review
parent dd962fd1bd a464a9fce8
commit 015c8a3ac0
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
View File

@@ -375,7 +375,15 @@ public class WifiEnterpriseConfig implements Parcelable {
return false;
}
// wpa_supplicant can update the anonymous identity for these kinds of networks after
// framework reads them, so make sure the framework doesn't try to overwrite them.
boolean shouldNotWriteAnonIdentity = mEapMethod == WifiEnterpriseConfig.Eap.SIM
|| mEapMethod == WifiEnterpriseConfig.Eap.AKA
|| mEapMethod == WifiEnterpriseConfig.Eap.AKA_PRIME;
for (String key : mFields.keySet()) {
if (shouldNotWriteAnonIdentity && ANON_IDENTITY_KEY.equals(key)) {
continue;
}
if (!saver.saveValue(key, mFields.get(key))) {
return false;
}