commit 08f70800650c52589dca97a3e94a7add33c1dd5b
author Xinyi Zhou <zxy@google.com> Mon May 22 11:52:53 2023 -0700
committer Xinyi Zhou <zxy@google.com> Tue May 23 19:31:09 2023 +0000
tree e855d70e1d72b09e86708abf3f19875ffea73a3e
parent 76f4365d748949a0102fe3b28f14830837d72109

Fix to correct the filter setting in order
Patched from ag/23208840

Bug: 282106309
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I5ed80f62d68ed5fb93fa6d182a4c2825cdb6b26d

nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java

diff --git a/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java b/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java
index e68d22a..4b76eba 100644
--- a/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java
+++ b/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManagerLegacy.java
@@ -254,14 +254,16 @@
             ScanListenerRecord scanListenerRecord =
                     new ScanListenerRecord(scanRequest, listener, callerIdentity, deathRecipient);
 
+            mScanTypeScanListenerRecordMap.put(listenerBinder, scanListenerRecord);
             Boolean started = startProviders(scanRequest);
             if (started == null) {
+                mScanTypeScanListenerRecordMap.remove(listenerBinder);
                 return NearbyManager.ScanStatus.UNKNOWN;
             }
             if (!started) {
+                mScanTypeScanListenerRecordMap.remove(listenerBinder);
                 return NearbyManager.ScanStatus.ERROR;
             }
-            mScanTypeScanListenerRecordMap.put(listenerBinder, scanListenerRecord);
             NearbyMetrics.logScanStarted(scanListenerRecord.hashCode(), scanRequest);
             if (mScanMode < scanRequest.getScanMode()) {
                 mScanMode = scanRequest.getScanMode();