Merge "Fix to correct the filter setting in order Patched from ag/23208840" into udc-dev

This commit is contained in:
Xinyi Zhou 2023-05-23 22:07:05 +00:00 • committed by Android (Google) Code Review
commit d2f58d0d7e

View file

@ -254,14 +254,16 @@ public class DiscoveryProviderManagerLegacy implements AbstractDiscoveryProvider
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();