commit cbc94dba27f828dfe9ea7249f99ea73cc16b359d
author Jorim Jaggi <jjaggi@google.com> Wed Sep 25 06:29:30 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 25 06:29:30 2019 -0700
tree 12e824a39ed2a88d207259f2d2da40fb297824a0
parent e0cc72f3ce1c6fba89eddf3884845667cce6f365
parent a533b92720c7504fff3ee9010078b6567c7b54fb

Merge changes from topic "flicker-move" am: 3289d4616b
am: a533b92720

Change-Id: Id9670a6706aa7254ede01872cfcdce526aed7b63

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index df1244b..35be851 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1834,6 +1834,12 @@
     mVsyncModulator.onRefreshed(mHadClientComposition);
 
     mLayersWithQueuedFrames.clear();
+    if (mVisibleRegionsDirty) {
+        mVisibleRegionsDirty = false;
+        if (mTracingEnabled) {
+            mTracing.notify("visibleRegionsDirty");
+        }
+    }
 }
 
 
@@ -1843,9 +1849,6 @@
 
     if (mVisibleRegionsDirty) {
         computeLayerBounds();
-        if (mTracingEnabled) {
-            mTracing.notify("visibleRegionsDirty");
-        }
     }
 
     for (auto& layer : mLayersPendingRefresh) {
@@ -2252,7 +2255,6 @@
     // rebuild the visible layer list per screen
     if (CC_UNLIKELY(mVisibleRegionsDirty)) {
         ATRACE_NAME("rebuildLayerStacks VR Dirty");
-        mVisibleRegionsDirty = false;
         invalidateHwcGeometry();
 
         for (const auto& pair : mDisplays) {