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

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

Merge "For tests hci_layer::callback_handlers private=>protected" am:... 

Merge "For tests hci_layer::callback_handlers private=>protected" am: 3a1d29d0 am: a858ae6b am: f6b1d82d am: 48e98375 am: 93a59bc1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2056564



Change-Id: Ic1415f60f04847a78134a93ecf5677c704fca5f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 297b06e6 93a59bc1

system/gd/hci/hci_layer.h

+4 −3
Original line number Diff line number Diff line
@@ -118,6 +118,10 @@ class HciLayer : public Module, public CommandInterface<CommandBuilder> { 
      hci::ErrorCode hci_status, uint16_t handle, uint8_t version, uint16_t manufacturer_name, uint16_t sub_version);

  virtual void RegisterLeMetaEventHandler(common::ContextualCallback<void(EventView)> event_handler);



  std::list<common::ContextualCallback<void(uint16_t, ErrorCode)>> disconnect_handlers_;

  std::list<common::ContextualCallback<void(hci::ErrorCode, uint16_t, uint8_t, uint16_t, uint16_t)>>

      read_remote_version_handlers_;



 private:

  struct impl;

  struct hal_callbacks;
@@ -142,9 +146,6 @@ class HciLayer : public Module, public CommandInterface<CommandBuilder> { 
    HciLayer& hci_;

  };



  std::list<common::ContextualCallback<void(uint16_t, ErrorCode)>> disconnect_handlers_;

  std::list<common::ContextualCallback<void(hci::ErrorCode, uint16_t, uint8_t, uint16_t, uint16_t)>>

      read_remote_version_handlers_;

  std::mutex callback_handlers_guard_;

  void on_disconnection_complete(EventView event_view);

  void on_read_remote_version_complete(EventView event_view);