[DO NOT MERGE] Fix to correct the filter setting in order
Bug: 282106309
Test: on device
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: I14b24770c35730cc681397e09cab11d589b825ce
diff --git a/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java b/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java
index 59db5d8..7fcf8f8 100644
--- a/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java
+++ b/nearby/service/java/com/android/server/nearby/managers/DiscoveryProviderManager.java
@@ -181,14 +181,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();