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

Commit 0e55fec5 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

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

parents 3004ccf5 6ebe2513

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();

    }