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

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

Merge "When user presses the power key while playing a local video, the... 

Merge "When user presses the power key while playing a local video, the surfaceflinger will crash." am: 60aac74f am: 08aa4147

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

Change-Id: I27b3c33dbbbc5d65c7aedd4bd9f5dee4e123828d
parents 5838e98c 08aa4147

services/surfaceflinger/BufferLayer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -325,7 +325,7 @@ void BufferLayer::preparePerFrameCompositionState() { 
                : Hwc2::IComposerClient::Composition::DEVICE;

                : Hwc2::IComposerClient::Composition::DEVICE;

    }

    }





    compositionState->buffer = mBufferInfo.mBuffer->getBuffer();

    compositionState->buffer = getBuffer();

    compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT)

    compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT)

            ? 0

            ? 0

            : mBufferInfo.mBufferSlot;

            : mBufferInfo.mBufferSlot;