release-request-011e6329-d82e-4e46-980f-68776b0cd6b9-for-git_oc-release-4080367 snap-temp-L79900000072116775

Change-Id: Ifdf955676234eacb9e8577d7a33978a013eaffd6

1 files changed, 7 insertions, 0 deletions

diff --git a/src/com/android/bluetooth/gatt/ScanManager.java b/src/com/android/bluetooth/gatt/ScanManager.java
index a17e02f6d..0f465220f 100644
--- a/src/com/android/bluetooth/gatt/ScanManager.java
+++ b/src/com/android/bluetooth/gatt/ScanManager.java
@@ -685,6 +685,7 @@ public class ScanManager {
                 Log.w(TAG,
                         "Moving scan client to opportunistic (scannerId " + client.scannerId + ")");
                 setOpportunisticScanClient(client);
+                removeScanFilters(client.scannerId);
                 client.stats.setScanTimeout();
             }
 
@@ -769,6 +770,12 @@ public class ScanManager {
             int scannerId = client.scannerId;
             int deliveryMode = getDeliveryMode(client);
             int trackEntries = 0;
+
+            // Do not add any filters set by opportunistic scan clients
+            if (isOpportunisticScanClient(client)) {
+                return;
+            }
+
             if (!shouldAddAllPassFilterToController(client, deliveryMode)) {
                 return;
             }