commit 4f4fdaf664d708061d804edceb7c80f0851b7243
author Yuexi Ma <yuexima@google.com> Fri Mar 10 20:58:03 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 10 20:58:04 2017 +0000
tree 54416f3a03e383d6787a6f9defb0e07ad442a67b
parent 66a4ca3c928c08f2aa96a5ba1b60e93fa156d26c
parent 6b8720110bf2d40ac1364c364a85c31b358889f1

Merge "Change vts target base test class name"

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