Merge "Fix bluetooth AIDL restart fail when open HCI Fail" am: 0e55fec5c3 am: 288283d9c5 am: f9a467a874

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2643490

Change-Id: Ia0f205252e1d029567a7d6e831a43d924167f909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Myles Watson
2023-06-29 16:04:25 +00:00
committed by Automerger Merge Worker

View File

@@ -224,6 +224,7 @@ ndk::ScopedAStatus BluetoothHci::initialize(
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 @@ ndk::ScopedAStatus BluetoothHci::close() {
{
std::lock_guard<std::mutex> guard(mStateMutex);
if (mState != HalState::ONE_CLIENT) {
ASSERT(mState != HalState::INITIALIZING);
ALOGI("Already closed");
return ndk::ScopedAStatus::ok();
}