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

Commit 9ff8f0bf authored by Joseph Pirozzo's avatar Joseph Pirozzo Committed by Gerrit Code Review
Browse files

Merge "Initialize pointers for vendor_interface"

parents 88696327 c1e10a33

bluetooth/1.0/default/vendor_interface.cc

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ void VendorInterface::Close() { 
    lib_interface_->op(BT_VND_OP_POWER_CTRL, &power_state);



    lib_interface_->cleanup();

    lib_interface_ = nullptr;

  }



  if (lib_handle_ != nullptr) {

bluetooth/1.0/default/vendor_interface.h

+4 −4
Original line number Diff line number Diff line
@@ -58,15 +58,15 @@ class VendorInterface { 


  void HandleIncomingEvent(const hidl_vec<uint8_t>& hci_packet);



  void* lib_handle_;

  bt_vendor_interface_t* lib_interface_;

  void* lib_handle_ = nullptr;

  bt_vendor_interface_t* lib_interface_ = nullptr;

  async::AsyncFdWatcher fd_watcher_;

  InitializeCompleteCallback initialize_complete_cb_;

  hci::HciProtocol* hci_;

  hci::HciProtocol* hci_ = nullptr;



  PacketReadCallback event_cb_;



  FirmwareStartupTimer* firmware_startup_timer_;

  FirmwareStartupTimer* firmware_startup_timer_ = nullptr;

};



}  // namespace implementation