summaryrefslogtreecommitdiffstats
path: root/libs/WifiTrackerLib/src
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-08-14 01:08:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-08-14 01:08:09 +0000
commitcb9118cb18859b3fa9a25ec2a5bc0c6438512545 (patch)
tree4e19f6c6d70e59fbaebae1824f408d0a2d5b6d78 /libs/WifiTrackerLib/src
parent26bfeeeb26e6569495bcfbf733f26bb9323662e1 (diff)
parentae0ff85e697a2919fc743d91fc8bf7b25e1c3be8 (diff)
downloadframeworks_opt_net_wifi-cb9118cb18859b3fa9a25ec2a5bc0c6438512545.tar.gz
frameworks_opt_net_wifi-cb9118cb18859b3fa9a25ec2a5bc0c6438512545.tar.bz2
frameworks_opt_net_wifi-cb9118cb18859b3fa9a25ec2a5bc0c6438512545.zip
Merge "[WifiTrackerLib] Don't remove connected passpoint entry with no scans" into rvc-qpr-dev am: ae0ff85e69
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/12370679 Change-Id: I896e65dd15bfbbf00c6532a4424a8484eefa4e74
Diffstat (limited to 'libs/WifiTrackerLib/src')
-rw-r--r--libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
index bb3a2246a..0a9bc5634 100644
--- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
+++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiPickerTracker.java
@@ -491,7 +491,8 @@ public class WifiPickerTracker extends BaseWifiTracker {
// Remove entries that are now unreachable
mPasspointWifiEntryCache.entrySet()
.removeIf(entry -> entry.getValue().getLevel() == WIFI_LEVEL_UNREACHABLE
- || !seenKeys.contains(entry.getKey()));
+ || (!seenKeys.contains(entry.getKey()))
+ && entry.getValue().getConnectedState() == CONNECTED_STATE_DISCONNECTED);
}
@WorkerThread