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

Commit a464a9fc authored by Mitchell Wills's avatar Mitchell Wills
Browse files

Don't save the anonymous identity for EAP-SIM/AKA/AKA-Prime 

wpa_supplicant can update this value when authenticating so if the
framework writes it back the new value can be overwritten.

TEST: Patch was validated by original reporter
      Enterprise tests pass (b/29608435)
Change-Id: If359b4ca625371fbdb68177c7cdb6498c3a519a1
Fixes: 28161335
parent 74ab2380

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;

            }