From 96dd54c7507f9a5b94dd91719e83f5059e0c8c7d Mon Sep 17 00:00:00 2001
From: Quang Luong <qal@google.com>
Date: Wed, 12 Aug 2020 17:03:32 -0700
Subject: [WifiTrackerLib] Don't remove connected passpoint entry with no scans

Connected Passpoint entries should not be removed from the wifi picker
list if they aren't seen in the scan results.

Bug: 162911670
Test: atest WifiPickerTrackerTest
Change-Id: I15a6d321659160aceddd428310f6b4c564c3058a
---
 .../src/com/android/wifitrackerlib/WifiPickerTracker.java              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libs/WifiTrackerLib/src')

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
-- 
cgit v1.2.3