| commit | ab5057e8c0f2b5c21cb9196f39fd0ab4e19ecba7 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Feb 02 15:30:07 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 02 15:30:07 2022 +0000 |
| tree | cf3bdda1f928036664037e970e130ca911c4e9ed | |
| parent | 5838e98c61b0d6cfd4f8825d36ab753d70ee4c25 [diff] | |
| parent | 08aa41473c87aa37ec2fc679e0a4f9108c2aaf49 [diff] |
Merge "When user presses the power key while playing a local video, the surfaceflinger will crash." am: 60aac74fbc am: 08aa41473c Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1920360 Change-Id: I27b3c33dbbbc5d65c7aedd4bd9f5dee4e123828d
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;