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

Commit f47cf074 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "SF: Remove a redundant write" into rvc-dev am: 48dc9323 am: 9ad8ca43 

Change-Id: I4880c0347b0b5c511e6f09b24ebf2315c2b2b682
parents b85ff3b1 9ad8ca43

services/surfaceflinger/BufferQueueLayer.cpp

+0 −2
Original line number Diff line number Diff line
@@ -346,8 +346,6 @@ status_t BufferQueueLayer::updateActiveBuffer() { 
    mPreviousBufferId = getCurrentBufferId();

    mBufferInfo.mBuffer =

            mConsumer->getCurrentBuffer(&mBufferInfo.mBufferSlot, &mBufferInfo.mFence);

    auto* layerCompositionState = editCompositionState();

    layerCompositionState->buffer = mBufferInfo.mBuffer;



    if (mBufferInfo.mBuffer == nullptr) {

        // this can only happen if the very first buffer was rejected.

services/surfaceflinger/BufferStateLayer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -616,7 +616,6 @@ status_t BufferStateLayer::updateActiveBuffer() { 
    mPreviousBufferId = getCurrentBufferId();

    mBufferInfo.mBuffer = s.buffer;

    mBufferInfo.mFence = s.acquireFence;

    editCompositionState()->buffer = mBufferInfo.mBuffer;



    return NO_ERROR;

}