| commit | 2c3de224a5bf7ab375aabf21a345c52ce2f9e144 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Feb 02 15:39:58 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 02 15:39:58 2022 +0000 |
| tree | e98e3d07f9a9398caef353d16587abd06ce4a48a | |
| parent | d1347913f109865df620af3ab8ea76f5439ea357 [diff] | |
| parent | ab5057e8c0f2b5c21cb9196f39fd0ab4e19ecba7 [diff] |
Merge "When user presses the power key while playing a local video, the surfaceflinger will crash." am: 60aac74fbc am: 08aa41473c am: ab5057e8c0 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1920360 Change-Id: I31b79cd93828a586bbde7421a166545f4422721a
diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp index 8c97f12..636555e 100644 --- a/services/surfaceflinger/BufferLayer.cpp +++ b/services/surfaceflinger/BufferLayer.cpp
@@ -327,7 +327,7 @@ : Hwc2::IComposerClient::Composition::DEVICE; } - compositionState->buffer = mBufferInfo.mBuffer->getBuffer(); + compositionState->buffer = getBuffer(); compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT) ? 0 : mBufferInfo.mBufferSlot;