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