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

Commit ecdcb708 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "RootCanal: Avoid a couple string copies" am: a382f969 am: c890ba43 am: 335ffbe0 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1819233

Change-Id: I10ec47c06e8a4ad64b79acefd8e1e27928e4769a
parents ad402897 335ffbe0

system/vendor_libs/test_vendor_lib/model/devices/hci_socket_device.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ using std::vector; 
namespace test_vendor_lib {

namespace test_vendor_lib {





HciSocketDevice::HciSocketDevice(std::shared_ptr<AsyncDataChannel> socket,

HciSocketDevice::HciSocketDevice(std::shared_ptr<AsyncDataChannel> socket,

                                 std::string properties_filename)

                                 const std::string& properties_filename)

    : DualModeController(properties_filename), socket_(socket) {

    : DualModeController(properties_filename), socket_(socket) {

  advertising_interval_ms_ = std::chrono::milliseconds(1000);

  advertising_interval_ms_ = std::chrono::milliseconds(1000);

system/vendor_libs/test_vendor_lib/model/devices/hci_socket_device.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -34,12 +34,12 @@ using android::net::AsyncDataChannel; 
class HciSocketDevice : public DualModeController {

class HciSocketDevice : public DualModeController {

 public:

 public:

  HciSocketDevice(std::shared_ptr<AsyncDataChannel> socket,

  HciSocketDevice(std::shared_ptr<AsyncDataChannel> socket,

                  std::string properties_filename);

                  const std::string& properties_filename);

  ~HciSocketDevice() = default;

  ~HciSocketDevice() = default;





  static std::shared_ptr<HciSocketDevice> Create(

  static std::shared_ptr<HciSocketDevice> Create(

      std::shared_ptr<AsyncDataChannel> socket,

      std::shared_ptr<AsyncDataChannel> socket,

      std::string properties_filename) {

      const std::string& properties_filename) {

    return std::make_shared<HciSocketDevice>(socket, properties_filename);

    return std::make_shared<HciSocketDevice>(socket, properties_filename);

  }

  }