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

diff --git a/include/hardware/ble_scanner.h b/include/hardware/ble_scanner.h
index 9d086a5..1588085 100644 (file)
--- a/include/hardware/ble_scanner.h
+++ b/include/hardware/ble_scanner.h
@@ -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,

diff --git a/main/shim/le_scanning_manager.cc b/main/shim/le_scanning_manager.cc
index 773f658..1661e4a 100644 (file)
--- a/main/shim/le_scanning_manager.cc
+++ b/main/shim/le_scanning_manager.cc
@@ -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));
   }