commit 9402f4fa5166f95c4cc5f8164f0930261ff58dd0
author Leon Scroggins <scroggo@google.com> Wed Apr 12 17:32:59 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 12 17:32:59 2023 +0000
tree c956fec04188b95a319bdb20042c9d63b9abba89
parent b652b7904d391c9292ff9de0375b498ffb8e298b
parent 43b5d521210b89dbc72c3c5cca8c10454fad3348

Merge "Skip renderCachedSets if the Output is not enabled" into udc-dev

services/surfaceflinger/CompositionEngine/src/Output.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index e720af5..d64231f 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -1574,9 +1574,10 @@
 }
 
 void Output::renderCachedSets(const CompositionRefreshArgs& refreshArgs) {
-    if (mPlanner) {
-        mPlanner->renderCachedSets(getState(), refreshArgs.scheduledFrameTime,
-                                   getState().usesDeviceComposition || getSkipColorTransform());
+    const auto& outputState = getState();
+    if (mPlanner && outputState.isEnabled) {
+        mPlanner->renderCachedSets(outputState, refreshArgs.scheduledFrameTime,
+                                   outputState.usesDeviceComposition || getSkipColorTransform());
     }
 }