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

Commit bf6c4d41 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "audio: Fix AudioTrack stuck while interrupting waitStreamEndDone" am:... 

Merge "audio: Fix AudioTrack stuck while interrupting waitStreamEndDone" am: 0384ae1b am: 4be61cd2 am: 1eec4f36 am: b1e892e3

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

Change-Id: Idd1baa8d427fda169e73b3b5b244ea97312f56c2
parents 3e014877 b1e892e3

media/libaudioclient/AudioTrack.cpp

+1 −1
Original line number Diff line number Diff line
@@ -469,8 +469,8 @@ void AudioTrack::stopAndJoinCallbacks() { 
    // Otherwise the callback thread will never exit.

    stop();

    if (mAudioTrackThread != 0) { // not thread safe

        mProxy->interrupt();

        mAudioTrackThread->requestExit();   // see comment in AudioTrack.h

        mProxy->interrupt();

        mAudioTrackThread->requestExitAndWait();

        mAudioTrackThread.clear();

    }