commit 2bd3639d1651cd8aae4ef5e7e9b77fcce729be92
author Rob Carr <racarr@google.com> Fri Jun 25 20:33:08 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 25 20:33:08 2021 +0000
tree d6b302d67a44bddd97bb49ccb883969fb6c9606e
parent 84340f77a5c68208bd5e508e82f06b98170cd079
parent 315f3c74f68483241ee523126aff925d8ddeda74

Merge "Fix latching of final buffer when moving off-screen and destroying" into sc-dev

services/surfaceflinger/BufferStateLayer.cpp

diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index 6b5cf04..c662bc2 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -725,7 +725,7 @@
 
 bool BufferStateLayer::hasFrameUpdate() const {
     const State& c(getDrawingState());
-    return mDrawingStateModified && (c.buffer != nullptr || c.bgColorLayer != nullptr);
+    return (mDrawingStateModified || mDrawingState.modified) && (c.buffer != nullptr || c.bgColorLayer != nullptr);
 }
 
 status_t BufferStateLayer::updateTexImage(bool& /*recomputeVisibleRegions*/, nsecs_t latchTime,