commit 8e9b0aa01b70f339722ec5282e5f52d7e74ad3d1
author Jorim Jaggi <jjaggi@google.com> Wed Sep 25 06:43:05 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Sep 25 06:43:05 2019 -0700
tree 67803c56fe8fda6ef81b15a70d2209c459680497
parent d47dc2eca90c868ab4fe483856e6f98b7254162a
parent cbc94dba27f828dfe9ea7249f99ea73cc16b359d

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

Change-Id: I80226ff003f4fed703305f74699d95531d04945b

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index e651ffe..200da2e 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1851,6 +1851,12 @@
     mVsyncModulator.onRefreshed(mHadClientComposition);
 
     mLayersWithQueuedFrames.clear();
+    if (mVisibleRegionsDirty) {
+        mVisibleRegionsDirty = false;
+        if (mTracingEnabled) {
+            mTracing.notify("visibleRegionsDirty");
+        }
+    }
 }
 
 
@@ -1860,9 +1866,6 @@
 
     if (mVisibleRegionsDirty) {
         computeLayerBounds();
-        if (mTracingEnabled) {
-            mTracing.notify("visibleRegionsDirty");
-        }
     }
 
     for (auto& layer : mLayersPendingRefresh) {
@@ -2269,7 +2272,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) {