summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Quang Luong <qal@google.com> 2019-02-14 11:51:01 -0800
committer Quang Luong <qal@google.com> 2019-02-14 11:51:01 -0800
commit48ad03ab503ebdbf452e149342a61643b81db336 (patch)
treeccf5ceadb1f27dae5422c6bce678772be7b2ba5f
parentb9218244e61995da9dd47e9bdf8f61dccc2d0eb2 (diff)
Fixed Passpoint network "saved" order in wifi picker
Changed AccessPoint.isSaved() to check that mConfig is not null, instead of checking if the networkId is valid. The networkId is set to the networkId of the loaded config, but the configs received for Passpoint networks do not have a valid networkId set. Thus, Passpoint AccessPoints were not treated as saved during sorting, despite showing "Saved" in the summary. Test: atest WifiTrackerTest && atest AccessPointTest Bug: 118705403 Change-Id: I254602aee8852a2acbf0c987a31051f2b9ae2a92
-rw-r--r--packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index ac2c2c946725..43affcdfefe9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -1065,7 +1065,7 @@ public class AccessPoint implements Comparable<AccessPoint> {
}
public boolean isSaved() {
- return networkId != WifiConfiguration.INVALID_NETWORK_ID;
+ return mConfig != null;
}
public Object getTag() {