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

Commit f2f9a236 authored by Hansong Zhang's avatar Hansong Zhang Committed by android-build-merger
Browse files

Merge "HAL cert and facade: Unregister HCI on shutdown" 

am: a452eae8

Change-Id: I8034f577f6d12a92fc2c433b54fdf2bd1e53c244
parents 59657565 a452eae8

system/gd/hal/cert/cert.cc

+4 −0
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ class HciHalCertService : public HciHalCert::Service, public ::bluetooth::hal::H 
    hal->registerIncomingPacketCallback(this);

  }



  ~HciHalCertService() {

    hal_->unregisterIncomingPacketCallback();

  }



  ::grpc::Status SendHciResetCommand(::grpc::ServerContext* context, const ::google::protobuf::Empty* request,

                                     ::google::protobuf::Empty* response) override {

    std::unique_lock<std::mutex> lock(mutex_);

system/gd/hal/facade.cc

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ class HciHalFacadeService 
    hal->registerIncomingPacketCallback(this);

  }



  ~HciHalFacadeService() {

    hal_->unregisterIncomingPacketCallback();

  }



  ::grpc::Status SendHciResetCommand(::grpc::ServerContext* context, const ::google::protobuf::Empty* request,

                                     ::google::protobuf::Empty* response) override {

    std::unique_lock<std::mutex> lock(mutex_);