commit 051d6bd2dd897d3454a499cb8c8070d983e6a1ee
author Myles Watson <mylesgw@google.com> Fri Mar 10 09:10:51 2017 -0800
committer gitbuildkicker <android-build@google.com> Fri Mar 10 13:46:01 2017 -0800
tree 6a76667b8b0690f59aa5530604d96edbcb1fb2d3
parent 3f0bcf0bc22688c5cffb3404fea7a56946bac4c0

Bluetooth: Power off after closing the UART

Bug: 36084266
Test: angler & marlin switch users (Toggle Bluetooth under load)
Change-Id: I1e0c34e334d11b9dcf9df62cbde3d5556c537bd7
(cherry picked from commit 66a4ca3c928c08f2aa96a5ba1b60e93fa156d26c)

bluetooth/1.0/default/vendor_interface.cc

diff --git a/bluetooth/1.0/default/vendor_interface.cc b/bluetooth/1.0/default/vendor_interface.cc
index 2576eca..a6507dd 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -273,9 +273,6 @@
   if (lib_interface_ != nullptr) {
     bt_vendor_lpm_mode_t mode = BT_VND_LPM_DISABLE;
     lib_interface_->op(BT_VND_OP_LPM_SET_MODE, &mode);
-
-    int power_state = BT_VND_PWR_OFF;
-    lib_interface_->op(BT_VND_OP_POWER_CTRL, &power_state);
   }
 
   fd_watcher_.StopWatchingFileDescriptors();
@@ -287,6 +284,9 @@
 
   if (lib_interface_ != nullptr) {
     lib_interface_->op(BT_VND_OP_USERIAL_CLOSE, nullptr);
+
+    int power_state = BT_VND_PWR_OFF;
+    lib_interface_->op(BT_VND_OP_POWER_CTRL, &power_state);
   }
 
   if (lib_handle_ != nullptr) {