summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-02-02 14:54:57 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2022-02-02 14:54:57 +0000
commit60aac74fbc7ae26d82accb3aa017ae3045da9ed0 (patch)
treed22af95d8e8757eb39ac001033fdf4b317188e72
parent433448527019306bebd8c6537de75bb249f6340b (diff)
parent5061611b6e0e121dd6dc53c3c778dc8713e1a3dd (diff)
downloadnative-60aac74fbc7ae26d82accb3aa017ae3045da9ed0.tar.gz
Merge "When user presses the power key while playing a local video, the surfaceflinger will crash."
-rw-r--r--services/surfaceflinger/BufferLayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp
index 23779be73a..f2a69940af 100644
--- a/services/surfaceflinger/BufferLayer.cpp
+++ b/services/surfaceflinger/BufferLayer.cpp
@@ -325,7 +325,7 @@ void BufferLayer::preparePerFrameCompositionState() {
: Hwc2::IComposerClient::Composition::DEVICE;
}
- compositionState->buffer = mBufferInfo.mBuffer->getBuffer();
+ compositionState->buffer = getBuffer();
compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT)
? 0
: mBufferInfo.mBufferSlot;