Merge "Ensure deferred cleanup when display is off" am: 5cc75e347f am: bd970d02bc am: 4d22ff3782 am: 3fc5f4b765

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1952223

Change-Id: I9ff741dd575cfa3e9cf83861d31787c9d6a18310
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 61da45d..3459a8f 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2523,6 +2523,7 @@
     mTimeStats->recordDisplayEventConnectionCount(sfConnections + appConnections);
 
     if (isDisplayConnected && !display->isPoweredOn()) {
+        getRenderEngine().cleanupPostRender();
         return;
     }