summaryrefslogtreecommitdiffstats
path: root/service
diff options
context:
space:
mode:
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiConfigStore.java50
1 files changed, 50 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index a7c645bb4..67a699a67 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -2991,6 +2991,56 @@ public class WifiConfigStore extends IpConfigStore {
// No need to save realm or PLMN in supplicant
continue;
}
+ if (key.equals(WifiEnterpriseConfig.IDENTITY_KEY)) {
+ if ((config.enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.SIM)||
+ (config.enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.AKA)||
+ (config.enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.AKA_PRIME)) {
+ if ( (!newNetwork) && (value != null) && !mWifiNative.setNetworkVariable(
+ netId,
+ key,
+ "NULL")) {
+ loge(config.SSID + ": failed to set " + key +
+ ": " + value);
+ break setVariables;
+ }
+ } else {
+ if (!mWifiNative.setNetworkVariable(
+ netId,
+ key,
+ value)) {
+ removeKeys(enterpriseConfig);
+ loge(config.SSID + ": failed to set " + key +
+ ": " + value);
+ break setVariables;
+ }
+ }
+ continue;
+ }
+ if (key.equals(WifiEnterpriseConfig.ANON_IDENTITY_KEY)) {
+ if ((config.enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.SIM)||
+ (config.enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.AKA)||
+ (config.enterpriseConfig.getEapMethod() == WifiEnterpriseConfig.Eap.AKA_PRIME)) {
+ if ( (!newNetwork) && (value != null) && !mWifiNative.setNetworkVariable(
+ netId,
+ key,
+ "NULL")) {
+ loge(config.SSID + ": failed to set " + key +
+ ": " + value);
+ break setVariables;
+ }
+ } else {
+ if (!mWifiNative.setNetworkVariable(
+ netId,
+ key,
+ value)) {
+ removeKeys(enterpriseConfig);
+ loge(config.SSID + ": failed to set " + key +
+ ": " + value);
+ break setVariables;
+ }
+ }
+ continue;
+ }
if (!((newNetwork == false) && (savedValue != null) &&
(value != null) && value.equals(savedValue)) &&
!mWifiNative.setNetworkVariable(