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

Commit 53b3601c authored by Chienyuan's avatar Chienyuan Committed by Chienyuan Huang
Browse files

gd: Pass address of scan result by value 

Tag: #gd-refactor
Bug: 177044452
Test: gd/cert/run --host
Test: run CTS test
Change-Id: I0409629991894e1a7a94243d82e005a64b59af01
parent 3da5c358

system/include/hardware/ble_scanner.h

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class ScanningCallbacks { 
  virtual void OnScannerRegistered(const bluetooth::Uuid app_uuid,

                                   uint8_t scannerId, uint8_t status) = 0;

  virtual void OnScanResult(uint16_t event_type, uint8_t addr_type,

                            RawAddress* bda, uint8_t primary_phy,

                            RawAddress bda, uint8_t primary_phy,

                            uint8_t secondary_phy, uint8_t advertising_sid,

                            int8_t tx_power, int8_t rssi,

                            uint16_t periodic_adv_int,

system/main/shim/le_scanning_manager.cc

+2 −3
Original line number Diff line number Diff line
@@ -201,14 +201,13 @@ class BleScannerInterfaceImpl : public BleScannerInterface, 
                    std::vector<uint8_t> advertising_data) {

    RawAddress raw_address;

    RawAddress::FromString(address.ToString(), raw_address);

    std::unique_ptr<RawAddress> raw_address_ptr(new RawAddress(raw_address));



    do_in_jni_thread(

        FROM_HERE,

        base::BindOnce(&ScanningCallbacks::OnScanResult,

                       base::Unretained(scanning_callbacks_), event_type,

                       address_type, raw_address_ptr.get(), primary_phy,

                       secondary_phy, advertising_sid, tx_power, rssi,

                       address_type, raw_address, primary_phy, secondary_phy,

                       advertising_sid, tx_power, rssi,

                       periodic_advertising_interval, advertising_data));

  }