commit 60aac74fbc7ae26d82accb3aa017ae3045da9ed0
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 02 14:54:57 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 02 14:54:57 2022 +0000
tree d22af95d8e8757eb39ac001033fdf4b317188e72
parent 433448527019306bebd8c6537de75bb249f6340b
parent 5061611b6e0e121dd6dc53c3c778dc8713e1a3dd

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

services/surfaceflinger/BufferLayer.cpp

diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index 23779be..f2a6994 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -325,7 +325,7 @@
                 : Hwc2::IComposerClient::Composition::DEVICE;
     }
 
-    compositionState->buffer = mBufferInfo.mBuffer->getBuffer();
+    compositionState->buffer = getBuffer();
     compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT)
             ? 0
             : mBufferInfo.mBufferSlot;