Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48a2b01d authored by Mitchell Wills's avatar Mitchell Wills Committed by android-build-merger
Browse files

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

am: 015c8a3a

Change-Id: Ica7d71eb2884b8a7861f31902313ab8b2a713967
parents 709edf7a 015c8a3a

wifi/java/android/net/wifi/WifiEnterpriseConfig.java

+8 −0
Original line number Diff line number Diff line
@@ -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;

            }