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

Commit 6d74bd6a authored by Mathias Agopian's avatar Mathias Agopian Committed by Android Git Automerger
Browse files

am 5e80aa10: am d2d5a64a: workaround a deadlock when taking screenshots into a surface 

* commit '5e80aa10':
  workaround a deadlock when taking screenshots into a surface
parents 47e83a14 5e80aa10

libs/gui/BufferQueue.cpp

+2 −2
Original line number Diff line number Diff line
@@ -995,7 +995,7 @@ void BufferQueue::freeAllBuffersExceptHeadLocked() { 
}



status_t BufferQueue::drainQueueLocked() {

    while (mSynchronousMode && !mQueue.isEmpty()) {

    while (mSynchronousMode && mQueue.size() > 1) {

        mDequeueCondition.wait(mMutex);

        if (mAbandoned) {

            ST_LOGE("drainQueueLocked: BufferQueue has been abandoned!");
@@ -1012,7 +1012,7 @@ status_t BufferQueue::drainQueueLocked() { 
status_t BufferQueue::drainQueueAndFreeBuffersLocked() {

    status_t err = drainQueueLocked();

    if (err == NO_ERROR) {

        if (mSynchronousMode) {

        if (mQueue.empty()) {

            freeAllBuffersLocked();

        } else {

            freeAllBuffersExceptHeadLocked();