| commit | 288283d9c59098064a9fe80f00faf11e13839fe8 | [log] [tgz] |
|---|---|---|
| author | Myles Watson <mylesgw@google.com> | Thu Jun 29 14:37:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 29 14:37:38 2023 +0000 |
| tree | 2f02fadf9985fce560e447d624ad0441b703cea9 | |
| parent | 2a12f7e9a4cc4cfeae83cd4e0913b5801e5d4bae [diff] | |
| parent | 0e55fec5c31beb3d267e3b8b10b07efa0f85a149 [diff] |
Merge "Fix bluetooth AIDL restart fail when open HCI Fail" am: 0e55fec5c3 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2643490 Change-Id: Icd489ad746a5270d4850faf8f1fabb3664c0a1f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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(); }