commit 0e55fec5c31beb3d267e3b8b10b07efa0f85a149
author Myles Watson <mylesgw@google.com> Thu Jun 29 13:55:26 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 29 13:55:26 2023 +0000
tree 2f02fadf9985fce560e447d624ad0441b703cea9
parent 3004ccf550d43d5e89d5fd9c472ad799eff822cd
parent 6ebe25132221a389a3df8b0b197a9efff7a211f2

Merge "Fix bluetooth AIDL restart fail when open HCI Fail"

bluetooth/aidl/default/BluetoothHci.cpp

diff --git a/bluetooth/aidl/default/BluetoothHci.cpp b/bluetooth/aidl/default/BluetoothHci.cpp
index 18a371d..782122f 100644
--- a/bluetooth/aidl/default/BluetoothHci.cpp
+++ b/bluetooth/aidl/default/BluetoothHci.cpp
@@ -224,6 +224,7 @@
     ALOGI("Unable to open Linux interface, trying default path.");
     mFd = getFdFromDevPath();
     if (mFd < 0) {
+      mState = HalState::READY;
       cb->initializationComplete(Status::UNABLE_TO_OPEN_INTERFACE);
       return ndk::ScopedAStatus::ok();
     }
@@ -281,6 +282,7 @@
   {
     std::lock_guard<std::mutex> guard(mStateMutex);
     if (mState != HalState::ONE_CLIENT) {
+      ASSERT(mState != HalState::INITIALIZING);
       ALOGI("Already closed");
       return ndk::ScopedAStatus::ok();
     }