commit be09aaddca4d10347cb53edceb018c59414bec71
author Ady Abraham <adyabr@google.com> Mon May 03 18:59:38 2021 -0700
committer Ady Abraham <adyabr@google.com> Thu May 13 23:10:05 2021 +0000
tree 3f0af499ec598db1ebc99d4f8556241f1ef859c7
parent b45e770984a431a6d0fedc7c13d4d5b8c0f45ac1

SF: register layers with scheduler when added to current state

Scheduler shouldn't care about layers that are not part of the
current state as those layers are invisible.

Test: atest SetFrameRateTest
Bug: 186190571
Change-Id: Iee5a8ab6d54989f4a663e2fb51e3e956dd3cfa6e

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index ecee977..eaefc65 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -6437,13 +6437,17 @@
 
 void SurfaceFlinger::onLayerFirstRef(Layer* layer) {
     mNumLayers++;
-    mScheduler->registerLayer(layer);
+    if (!layer->isRemovedFromCurrentState()) {
+        mScheduler->registerLayer(layer);
+    }
 }
 
 void SurfaceFlinger::onLayerDestroyed(Layer* layer) {
-    mScheduler->deregisterLayer(layer);
     mNumLayers--;
     removeFromOffscreenLayers(layer);
+    if (!layer->isRemovedFromCurrentState()) {
+        mScheduler->deregisterLayer(layer);
+    }
 }
 
 // WARNING: ONLY CALL THIS FROM LAYER DTOR