commit 6e701afa3013c7a0a606d0847b113386c0515dad
author Vishnu Nair <vishnun@google.com> Thu May 04 17:27:48 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 04 17:27:48 2023 +0000
tree cc8371804d0095e1c0c5ad316cd75e3574e1bc0e
parent 0cec3ed248d1f0b82e3d86270a018ed7e7f8b620

Revert "[sf] Properly update clones of clones"

This reverts commit 0cec3ed248d1f0b82e3d86270a018ed7e7f8b620.

Reason for revert: testing to see if this is related to layer leaks seen here: b/280503684

Change-Id: I0ba48a412bbb771b70570a5f34e5c1a11d0ee28d

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e20b4cb..48b4144 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4007,21 +4007,8 @@
     }
 
     commitOffscreenLayers();
-    if (mLayerMirrorRoots.size() > 0) {
-        std::deque<Layer*> pendingUpdates;
-        pendingUpdates.insert(pendingUpdates.end(), mLayerMirrorRoots.begin(),
-                              mLayerMirrorRoots.end());
-        std::vector<Layer*> needsUpdating;
-        for (Layer* cloneRoot : mLayerMirrorRoots) {
-            pendingUpdates.pop_front();
-            if (cloneRoot->updateMirrorInfo(pendingUpdates)) {
-            } else {
-                needsUpdating.push_back(cloneRoot);
-            }
-        }
-        for (Layer* cloneRoot : needsUpdating) {
-            cloneRoot->updateMirrorInfo({});
-        }
+    if (mNumClones > 0) {
+        mDrawingState.traverse([&](Layer* layer) { layer->updateMirrorInfo(); });
     }
 }
 
@@ -4128,7 +4115,7 @@
         mBootStage = BootStage::BOOTANIMATION;
     }
 
-    if (mLayerMirrorRoots.size() > 0) {
+    if (mNumClones > 0) {
         mDrawingState.traverse([&](Layer* layer) { layer->updateCloneBufferInfo(); });
     }