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

Commit 7e75c7da authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "BufferQueueProducer: Log verbose log to warning instead of error." am:... 

Merge "BufferQueueProducer: Log verbose log to warning instead of error." am: e9b2010f am: bf8edbe0 am: 2824e91b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1822354

Change-Id: I69b8a1a7aa23d5ebc5f6125ef92fd70cb1c3bfad
parents 8b245c80 2824e91b

libs/gui/BufferQueueProducer.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -645,7 +645,10 @@ status_t BufferQueueProducer::detachBuffer(int slot) { 
                    slot, BufferQueueDefs::NUM_BUFFER_SLOTS);

                    slot, BufferQueueDefs::NUM_BUFFER_SLOTS);

            return BAD_VALUE;

            return BAD_VALUE;

        } else if (!mSlots[slot].mBufferState.isDequeued()) {

        } else if (!mSlots[slot].mBufferState.isDequeued()) {

            BQ_LOGE("detachBuffer: slot %d is not owned by the producer "

            // TODO(http://b/140581935): This message is BQ_LOGW because it

            // often logs when no actionable errors are present. Return to

            // using BQ_LOGE after ensuring this only logs during errors.

            BQ_LOGW("detachBuffer: slot %d is not owned by the producer "

                    "(state = %s)", slot, mSlots[slot].mBufferState.string());

                    "(state = %s)", slot, mSlots[slot].mBufferState.string());

            return BAD_VALUE;

            return BAD_VALUE;

        } else if (!mSlots[slot].mRequestBufferCalled) {

        } else if (!mSlots[slot].mRequestBufferCalled) {