summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Nordqvist <jannq@google.com>2015-08-18 17:04:27 -0700
committerJan Nordqvist <jannq@google.com>2015-08-18 17:04:27 -0700
commit8be016e09c31c9d0fb9044a9d3a9008bde559ca8 (patch)
tree60abc2adb3f203b1694f2834d4d2c4d8cebb625f
parent24d27d46ad357c27254b05c49ec33a210aca7436 (diff)
downloadwifi-8be016e09c31c9d0fb9044a9d3a9008bde559ca8.tar.gz
Ignoring SSID for Passpoint networks.
Bug: 23108342 Change-Id: I73eec12165cc7d506dbce99cd6752a4ca3232737
-rw-r--r--service/java/com/android/server/wifi/WifiConfigStore.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/service/java/com/android/server/wifi/WifiConfigStore.java b/service/java/com/android/server/wifi/WifiConfigStore.java
index d219531d3..7416cd6c7 100644
--- a/service/java/com/android/server/wifi/WifiConfigStore.java
+++ b/service/java/com/android/server/wifi/WifiConfigStore.java
@@ -2332,6 +2332,9 @@ public class WifiConfigStore extends IpConfigStore {
} else if (config != null) {
switch (key) {
case SSID_KEY:
+ if (config.isPasspoint()) {
+ break;
+ }
ssid = value;
if (config.SSID != null && !config.SSID.equals(ssid)) {
loge("Error parsing network history file, mismatched SSIDs");