Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2806b1a authored by Sonny Sasaka's avatar Sonny Sasaka
Browse files

Floss: Fix regression of no scan results 

Refactor in aosp/2470982 adds more restriction when ignoring scan
response: only for Android HCI extension should ignore scan response.
But actually the hardware filter is also used with non-Android HCI
extension, e.g. MSFT extension. Therefore we should relax the condition
to be not restricted to Android HCI scan mode only, just like prior to
the refactor.

Bug: 275587485
Tag: #floss
Test: Manual - e2e Fast Pair test with SRS-XB13

Change-Id: I2e617cce6fa0940657233b822eb73baf7a5215b9
parent da82ba8b

system/gd/hci/le_scanning_manager.cc

+4 −2
Original line number Original line Diff line number Diff line
@@ -385,9 +385,11 @@ struct LeScanningManager::impl : public LeAddressManagerCallback { 
    // configure a filter accept list based e.g. on the service UUIDs

    // configure a filter accept list based e.g. on the service UUIDs

    // found in the report, we ignore the scan responses as we cannot be

    // found in the report, we ignore the scan responses as we cannot be

    // certain that they will not be dropped by the filter.

    // certain that they will not be dropped by the filter.

    // TODO(b/275754998): Improve the decision on what to do with scan responses: Only when used

    // with hardware-filtering features should we ignore waiting for scan response, and make sure

    // scan responses are still reported too.

    scanning_reassembler_.SetIgnoreScanResponses(

    scanning_reassembler_.SetIgnoreScanResponses(

        filter_policy_ == LeScanningFilterPolicy::FILTER_ACCEPT_LIST_ONLY &&

        filter_policy_ == LeScanningFilterPolicy::FILTER_ACCEPT_LIST_ONLY);

        api_type_ == ScanApiType::ANDROID_HCI);





    auto complete_advertising_data = scanning_reassembler_.ProcessAdvertisingReport(

    auto complete_advertising_data = scanning_reassembler_.ProcessAdvertisingReport(

        event_type, address_type, address, advertising_sid, advertising_data);

        event_type, address_type, address, advertising_sid, advertising_data);