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

Commit 4f426e41 authored by Eric Laurent's avatar Eric Laurent Committed by Automerger Merge Worker
Browse files

Merge "Properly unlock on return in process thread" into tm-dev am: 91bd1193 am: 6ddd08d7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18169304



Change-Id: I5334337bab6dc888b3837743f594dcd5656c3206
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9c968882 6ddd08d7

media/libaudioclient/AudioRecord.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1331,6 +1331,7 @@ nsecs_t AudioRecord::processAudioBuffer() 
    const sp<IAudioRecordCallback> callback = mCallback.promote();

    if (!callback) {

        mCallback = nullptr;

        mLock.unlock();

        return NS_NEVER;

    }

    if (mAwaitBoost) {

media/libaudioclient/AudioTrack.cpp

+1 −0
Original line number Diff line number Diff line
@@ -2448,6 +2448,7 @@ nsecs_t AudioTrack::processAudioBuffer() 
    sp<IAudioTrackCallback> callback = mCallback.promote();

    if (!callback) {

        mCallback = nullptr;

        mLock.unlock();

        return NS_NEVER;

    }

    if (mAwaitBoost) {