commit 3282b3cfd9754ed448e7591d4f39ddcadcad5884
author Valerie Hau <vhau@google.com> Mon Feb 03 15:37:27 2020 -0800
committer Valerie Hau <vhau@google.com> Mon Feb 03 17:05:06 2020 -0800
tree 0e88f942be883a86adab64c14cb17ac86f59ced8
parent 20a6ee25857178a120aa91a3875ad8854c0b4426

TEMPORARY FIX: add sync point logic to BufferStateLayers

WindowManager still relies on deferred transaction logic,
and a BufferStateLayer may be deferred on itself.  Adding
sync point logic to BufferStateLayer for now to support,
must be removed as soon as WindowManager migrates off
deferred transactions

Bug: 146345307
Test: build, boot, ASurfaceControl_test, manual Chrome,
SurfaceFlinger_test

Change-Id: I20578ee2d11e89efdb93852113c193d694360c65

services/surfaceflinger/BufferStateLayer.cpp

diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index 278ad52..98cc529 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -138,6 +138,8 @@
         !mLayerDetached;
 }
 
+/* TODO: vhau uncomment once deferred transaction migration complete in
+ * WindowManager
 void BufferStateLayer::pushPendingState() {
     if (!mCurrentState.modified) {
         return;
@@ -145,13 +147,12 @@
     mPendingStates.push_back(mCurrentState);
     ATRACE_INT(mTransactionName.c_str(), mPendingStates.size());
 }
+*/
 
 bool BufferStateLayer::applyPendingStates(Layer::State* stateToCommit) {
-    const bool stateUpdateAvailable = !mPendingStates.empty();
-    while (!mPendingStates.empty()) {
-        popPendingState(stateToCommit);
-    }
-    mCurrentStateModified = stateUpdateAvailable && mCurrentState.modified;
+    mCurrentStateModified = mCurrentState.modified;
+    bool stateUpdateAvailable = Layer::applyPendingStates(stateToCommit);
+    mCurrentStateModified = stateUpdateAvailable && mCurrentStateModified;
     mCurrentState.modified = false;
     return stateUpdateAvailable;
 }