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

Commit 528a48ec 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 am:... 

Merge "Fix bluetooth AIDL restart fail when open HCI Fail" am: 0e55fec5 am: 288283d9 am: f9a467a8 am: 9cde8d75

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



Change-Id: I3bea8c31ac01c698d263eb9ece11e13bb5f75756
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d7e132a 9cde8d75

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

    }