commit af5b837f6fc9d0ee08b7f8b7920a1603ccc323ad
author Andre Eisenbach <eisenbach@google.com> Fri Mar 17 20:45:34 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 17 20:45:34 2017 +0000
tree 1d1fedc14fd385b40026943da9a8d466b292481b
parent 8d35ec3009a719424c3fc60eab29f15382ef6e79
parent 7218e04356d94d027be875f6beb122381384f6c5

Revert "Bluetooth: Don't disable LPM at power off" am: 8a9efb6e35 am: 4bae5b7775
am: 7218e04356

Change-Id: Iaf2dbc49d4741c4cf37a51601c0b21b3bd7a81a1

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 e6575b0..68cac5f 100644
--- a/bluetooth/1.0/default/vendor_interface.cc
+++ b/bluetooth/1.0/default/vendor_interface.cc
@@ -265,6 +265,13 @@
 }
 
 void VendorInterface::Close() {
+  // These callbacks may send HCI events (vendor-dependent), so make sure to
+  // StopWatching the file descriptor after this.
+  if (lib_interface_ != nullptr) {
+    bt_vendor_lpm_mode_t mode = BT_VND_LPM_DISABLE;
+    lib_interface_->op(BT_VND_OP_LPM_SET_MODE, &mode);
+  }
+
   fd_watcher_.StopWatchingFileDescriptors();
 
   if (hci_ != nullptr) {