commit 116cb566999d6508902295a1dcca5610998a21e5
author Hansong Zhang <hsz@google.com> Wed Jul 24 15:33:35 2019 -0700
committer Hansong Zhang <hsz@google.com> Wed Jul 24 15:34:05 2019 -0700
tree 2c232e089fe043e9f9763aaf22a296b1663cb009
parent 5b2eb835ac7523471fead6ff15ab4602f3628c23

HAL cert and facade: Unregister HCI on shutdown

Test: cert/run_cert.sh
Change-Id: I730b26ec7a15f4ec539c42e16a774c442be93ac9

gd/hal/cert/cert.cc

diff --git a/gd/hal/cert/cert.cc b/gd/hal/cert/cert.cc
index d637f13..a50b1f7 100644
--- a/gd/hal/cert/cert.cc
+++ b/gd/hal/cert/cert.cc
@@ -38,6 +38,10 @@
     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_);

gd/hal/facade.cc

diff --git a/gd/hal/facade.cc b/gd/hal/facade.cc
index 1072d59..7e486ac 100644
--- a/gd/hal/facade.cc
+++ b/gd/hal/facade.cc
@@ -45,6 +45,10 @@
     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_);