From 48ad03ab503ebdbf452e149342a61643b81db336 Mon Sep 17 00:00:00 2001 From: Quang Luong Date: Thu, 14 Feb 2019 11:51:01 -0800 Subject: 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 --- packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { } public boolean isSaved() { - return networkId != WifiConfiguration.INVALID_NETWORK_ID; + return mConfig != null; } public Object getTag() { -- cgit v1.2.3-59-g8ed1b