1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/bluetooth/gatt/ScanManager.java b/src/com/android/bluetooth/gatt/ScanManager.java
index 27e492f30..af5eeb021 100644
--- a/src/com/android/bluetooth/gatt/ScanManager.java
+++ b/src/com/android/bluetooth/gatt/ScanManager.java
@@ -441,7 +441,8 @@ public class ScanManager {
         }
 
         void startRegularScan(ScanClient client) {
-            if (mFilterIndexStack.isEmpty() && isFilteringSupported()) {
+            if (isFilteringSupported() && mFilterIndexStack.isEmpty() &&
+                    mClientFilterIndexMap.isEmpty()) {
                 initFilterIndexStack();
             }
             if (isFilteringSupported()) {
@@ -748,7 +749,7 @@ public class ScanManager {
             if (client.filters == null || client.filters.isEmpty()) {
                 return true;
             }
-            return client.filters.size() < mClientFilterIndexMap.size();
+            return client.filters.size() > mFilterIndexStack.size();
         }
 
         private void addFilterToController(int clientIf, ScanFilterQueue.Entry entry,