commit 284eea7a58d5540c5c99dfcdf7488d2e90c194ec
author Myles Watson <mylesgw@google.com> Fri Mar 10 13:08:59 2017 -0800
committer gitbuildkicker <android-build@google.com> Mon Mar 13 17:38:24 2017 -0700
tree 46c845aed227a7a0c7939a2b82b1840e00761eba
parent 007bd2d6137a7fb989c0888fbc80d4c72cdbf86c

hci: Close the HAL before cleaning up pending command queue and timers

This prevents errors in case of event callbacks being received or timers
being fired after the pending command queue has been deleted.

Bug: 36026072
Test: Turn Bluetooth off/on while scanning and file transfer
Change-Id: I7bb699e929a8b40e42a3543b5445885ae6b1b975
(cherry picked from commit d696e66cadd6592f32bc2efb74e3687554ba669c)

hci/src/hci_layer.cc

diff --git a/hci/src/hci_layer.cc b/hci/src/hci_layer.cc
index 18d57bb..6c9d79c 100644
--- a/hci/src/hci_layer.cc
+++ b/hci/src/hci_layer.cc
@@ -220,6 +220,14 @@
 static future_t* hci_module_shut_down() {
   LOG_INFO(LOG_TAG, "%s", __func__);
 
+  // Free the timers
+  alarm_free(command_response_timer);
+  command_response_timer = NULL;
+  alarm_free(startup_timer);
+  startup_timer = NULL;
+
+  hci_close();
+
   if (thread) {
     thread_stop(thread);
     thread_join(thread);
@@ -234,14 +242,6 @@
 
   packet_fragmenter->cleanup();
 
-  // Free the timers
-  alarm_free(command_response_timer);
-  command_response_timer = NULL;
-  alarm_free(startup_timer);
-  startup_timer = NULL;
-
-  hci_close();
-
   thread_free(thread);
   thread = NULL;