Call wakelock callouts in JNI thread

Bug: 180790614
Fixes: 180790614
Test: start up Bluetooth
Tag: #refactor
Ignore-AOSP-First: cherry-pick

Change-Id: If1eee9532f20e264ff33a0e2adbf1b06dc3900e6
Merged-In: If1eee9532f20e264ff33a0e2adbf1b06dc3900e6
(cherry picked from commit d773a9d418d2a8ee4fa983ca437efc6f368ac59a)

diff --git a/btif/src/bluetooth.cc b/btif/src/bluetooth.cc
index 4b83c05..7a267a3 100644 (file)
--- a/btif/src/bluetooth.cc
+++ b/btif/src/bluetooth.cc
@@ -526,14 +526,14 @@ int le_test_mode(uint16_t opcode, uint8_t* buf, uint8_t len) {
 static bt_os_callouts_t* wakelock_os_callouts_saved = nullptr;
 
 static int acquire_wake_lock_cb(const char* lock_name) {
-  return do_in_main_thread(
+  return do_in_jni_thread(
       FROM_HERE, base::Bind(base::IgnoreResult(
                                 wakelock_os_callouts_saved->acquire_wake_lock),
                             lock_name));
 }
 
 static int release_wake_lock_cb(const char* lock_name) {
-  return do_in_main_thread(
+  return do_in_jni_thread(
       FROM_HERE, base::Bind(base::IgnoreResult(
                                 wakelock_os_callouts_saved->release_wake_lock),
                             lock_name));