| commit | 9f9dccb229a762c3722a40a9a94638526e71a3f8 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Feb 02 15:54:45 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Feb 02 15:54:45 2022 +0000 |
| tree | a4d9d70c0a8bd465f726bc289d810b76b5e0bca5 | |
| parent | 254054370df069c84e9262ae696eb3b08a78e97f [diff] | |
| parent | 2c3de224a5bf7ab375aabf21a345c52ce2f9e144 [diff] |
Merge "When user presses the power key while playing a local video, the surfaceflinger will crash." am: 60aac74fbc am: 08aa41473c am: ab5057e8c0 am: 2c3de224a5 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1920360 Change-Id: I620ee0f42b2234802b92cb85506c3fd2e9cc9fbf
diff --git a/services/surfaceflinger/BufferLayer.cpp b/services/surfaceflinger/BufferLayer.cpp index e797b5d..b7e2ff3 100644 --- a/services/surfaceflinger/BufferLayer.cpp +++ b/services/surfaceflinger/BufferLayer.cpp
@@ -306,7 +306,7 @@ : aidl::android::hardware::graphics::composer3::Composition::DEVICE; } - compositionState->buffer = mBufferInfo.mBuffer->getBuffer(); + compositionState->buffer = getBuffer(); compositionState->bufferSlot = (mBufferInfo.mBufferSlot == BufferQueue::INVALID_BUFFER_SLOT) ? 0 : mBufferInfo.mBufferSlot;