commit 5723fbda94dc6c8ecc444360dc2de487585daa78
author Wale Ogunwale <ogunwale@google.com> Thu Feb 28 15:53:59 2019 +0000
committer Wale Ogunwale <ogunwale@google.com> Thu Feb 28 15:53:59 2019 +0000
tree c7eca1074a0e7773a6a166e278d5e4c2c4ceb105
parent b28f007e51fb84ff78ce8b053d80efb0efdbce20

Revert "Caching between SF and HWC for BufferStateLayers"

This reverts commit b28f007e51fb84ff78ce8b053d80efb0efdbce20.

Reason for revert: Causing pre-submit failure b/126704033

Change-Id: I17c99cd410b3fa3825d01fedd21a52451368b5c0

services/surfaceflinger/BufferQueueLayer.cpp

diff --git a/services/surfaceflinger/BufferQueueLayer.cpp b/services/surfaceflinger/BufferQueueLayer.cpp
index 76764ef..96c4992 100644
--- a/services/surfaceflinger/BufferQueueLayer.cpp
+++ b/services/surfaceflinger/BufferQueueLayer.cpp
@@ -367,7 +367,7 @@
     uint32_t hwcSlot = 0;
     sp<GraphicBuffer> hwcBuffer;
     (*outputLayer->editState().hwc)
-            .hwcBufferCache.getHwcBuffer(mActiveBuffer, &hwcSlot, &hwcBuffer);
+            .hwcBufferCache.getHwcBuffer(mActiveBufferSlot, mActiveBuffer, &hwcSlot, &hwcBuffer);
 
     auto acquireFence = mConsumer->getCurrentFence();
     auto error = hwcLayer->setBuffer(hwcSlot, hwcBuffer, acquireFence);