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

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

Merge "GD: Make destructors virtual not override" am: cbdfcea5 am: cd87ffef 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I393161b1a6c4c7b987a9b035d5fd08dd4650a939
parents 3096a2d2 cd87ffef

system/gd/hal/facade.cc

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ class HciHalFacadeService : public HciHalFacade::Service, public ::bluetooth::ha 
    hal->registerIncomingPacketCallback(this);

  }



  ~HciHalFacadeService() override {

  ~HciHalFacadeService() {

    hal_->unregisterIncomingPacketCallback();

  }

system/gd/hci/acl_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ class AclManager : public Module { 
  // "struct impl" is forwarded declared in .cc and compiler needs a concrete definition of "struct impl" when

  // compiling AclManager's destructor. Hence we need to forward declare the destructor for AclManager to delay

  // compiling AclManager's destructor until it starts linking the .cc file.

  ~AclManager() override;

  ~AclManager();



  // Should register only once when user module starts.

  // Generates OnConnectSuccess when an incoming connection is established.

system/gd/hci/acl_manager/classic_acl_connection.cc

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class AclConnectionTracker : public ConnectionManagementCallbacks { 
 public:

  AclConnectionTracker(AclConnectionInterface* acl_connection_interface)

      : acl_connection_interface_(acl_connection_interface) {}

  ~AclConnectionTracker() override {

  ~AclConnectionTracker() {

    // If callbacks were registered, they should have been delivered.

    ASSERT(client_callbacks_ == nullptr || queued_callbacks_.empty());

  }

system/gd/hci/acl_manager/classic_acl_connection.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class ClassicAclConnection : public AclConnection { 
  ClassicAclConnection();

  ClassicAclConnection(std::shared_ptr<Queue> queue, AclConnectionInterface* acl_connection_interface, uint16_t handle,

                       Address address);

  ~ClassicAclConnection() override;

  ~ClassicAclConnection();



  virtual Address GetAddress() const {

    return address_;

system/gd/hci/acl_manager/classic_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct classic_impl : public security::ISecurityManagerListener { 
        handler_->BindOn(this, &classic_impl::on_read_remote_version_information));

  }



  ~classic_impl() override {

  ~classic_impl() {

    for (auto event_code : AclConnectionEvents) {

      hci_layer_->UnregisterEventHandler(event_code);

    }