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

Commit 288283d9 authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Fix bluetooth AIDL restart fail when open HCI Fail" am: 0e55fec5 

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



Change-Id: Icd489ad746a5270d4850faf8f1fabb3664c0a1f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2a12f7e9 0e55fec5

bluetooth/aidl/default/BluetoothHci.cpp

+2 −0
Original line number Diff line number Diff line
@@ -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();

    }