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

Commit 9f9dccb2 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 am: ab5057e8 am: 2c3de224

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

Change-Id: I620ee0f42b2234802b92cb85506c3fd2e9cc9fbf
parents 25405437 2c3de224

services/surfaceflinger/BufferLayer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ void BufferLayer::preparePerFrameCompositionState() { 
                : aidl::android::hardware::graphics::composer3::Composition::DEVICE;

    }



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

    compositionState->buffer = getBuffer();

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

            ? 0

            : mBufferInfo.mBufferSlot;