commit 4bae5b7775a3968fd56b0aae2ad5b04ec9d8b0c6
author Andre Eisenbach <eisenbach@google.com> Fri Mar 17 20:38:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 17 20:38:29 2017 +0000
tree b20eb699fc60cef4ace0e5974524d79db4e03232
parent 8dffcb06c9ce7cdd54491111424fe38ed50624f6
parent 8a9efb6e354f184ee5b003fd40fad70f2d69c7cb

Revert "Bluetooth: Don't disable LPM at power off"
am: 8a9efb6e35

Change-Id: I2016ba4ec58a6151395d60073370636f7f2efd6a

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) {