Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42460a55 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "HAL: Fix formatting" am: bc1dcbb0 am: b05ddd6c am: 002c36d4 am: ba3be801 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1948094

Change-Id: I388806080a13b25c1623be5a9f9d5554e017f511
parents 8ac86e92 ba3be801

system/gd/hal/hci_hal_android_hidl.cc

+9 −11
Original line number Diff line number Diff line
@@ -228,9 +228,8 @@ class HciHalHidl : public HciHal { 
    ASSERT(bt_hci_ != nullptr);

    auto death_link = bt_hci_->linkToDeath(hci_death_recipient_, 0);

    ASSERT_LOG(death_link.isOk(), "Unable to set the death recipient for the Bluetooth HAL");

    // Block allows allocation of a variable that might be bypassed by goto.

    {

    callbacks_ = new InternalHciCallbacks(btaa_logger_, btsnoop_logger_);



    if (bt_hci_1_1_ != nullptr) {

      bt_hci_1_1_->initialize_1_1(callbacks_);

    } else {
@@ -240,7 +239,6 @@ class HciHalHidl : public HciHal { 
    // Don't timeout here, time out at a higher layer

    callbacks_->GetInitPromise()->get_future().wait();

  }

  }



  void Stop() override {

    ASSERT(bt_hci_ != nullptr);