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

Commit 3f4c7fca authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

audio: Align bluetooth start behavior 

When staring data transfer, if resuming of BT session fails,
the legacy implementation does not indicate an error, thus
causing an automatic retry on next transfer. The AIDL
implementation was switching the stream into an error state
instead. This could cause audio mute when the BT stack is
slow on resuming. This CL aligns AIDL with legacy behavior.

Bug: 333307789
Test: repro steps in the bug
Change-Id: I5080a7275671287f188930f041c5ff2215ed2e1e
parent ad6464d4

audio/aidl/default/bluetooth/StreamBluetooth.cpp

+7 −6
Original line number Diff line number Diff line
@@ -93,17 +93,18 @@ StreamBluetooth::StreamBluetooth(StreamContext* context, const Metadata& metadat 
::android::status_t StreamBluetooth::transfer(void* buffer, size_t frameCount,

                                              size_t* actualFrameCount, int32_t* latencyMs) {

    std::lock_guard guard(mLock);

    if (mBtDeviceProxy == nullptr || mBtDeviceProxy->getState() == BluetoothStreamState::DISABLED) {

    *actualFrameCount = 0;

    *latencyMs = StreamDescriptor::LATENCY_UNKNOWN;

    if (mBtDeviceProxy == nullptr || mBtDeviceProxy->getState() == BluetoothStreamState::DISABLED) {

        // The BT session is turned down, silently ignore write.

        return ::android::OK;

    }

    *actualFrameCount = 0;

    *latencyMs = 0;

    if (!mBtDeviceProxy->start()) {

        LOG(ERROR) << __func__ << ": state= " << mBtDeviceProxy->getState() << " failed to start";

        return -EIO;

        LOG(WARNING) << __func__ << ": state= " << mBtDeviceProxy->getState()

                     << " failed to start, will retry";

        return ::android::OK;

    }

    *latencyMs = 0;

    const size_t bytesToTransfer = frameCount * mFrameSizeBytes;

    const size_t bytesTransferred = mIsInput ? mBtDeviceProxy->readData(buffer, bytesToTransfer)

                                             : mBtDeviceProxy->writeData(buffer, bytesToTransfer);