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

Commit 470b7752 authored by Erik Wolsheimer's avatar Erik Wolsheimer Committed by android-build-merger
Browse files

fix deadlock in MediaPlayerService BUG: 25263909 

am: 7845a1f0

* commit '7845a1f0':
  fix deadlock in MediaPlayerService BUG: 25263909
parents e9ce1b14 7845a1f0

media/libmediaplayerservice/MediaPlayerService.cpp

+7 −2
Original line number Diff line number Diff line
@@ -1890,8 +1890,13 @@ void MediaPlayerService::AudioOutput::pause() 
void MediaPlayerService::AudioOutput::close()

{

    ALOGV("close");

    sp<AudioTrack> track;

    {

        Mutex::Autolock lock(mLock);

    close_l();

        track = mTrack;

        close_l(); // clears mTrack

    }

    // destruction of the track occurs outside of mutex.

}



void MediaPlayerService::AudioOutput::setVolume(float left, float right)