commit 1dc674b0537e19fc256d6c63b248bcd6e3df6c05
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 19 02:45:24 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 19 02:45:24 2019 +0000
tree a395fc68c5777f34ab07c481d420c88b0e11daa9
parent d53226fe842b46453a51e60e6586b48fbecd7d28
parent df5290534ed9556c0bc77425855f5988b37c9631

Merge "Fix surface tracing thread sync issues"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 60c6e4e..b9d3dd2 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1801,6 +1801,12 @@
     mVsyncModulator.onRefreshed(mHadClientComposition);
 
     mLayersWithQueuedFrames.clear();
+    if (mVisibleRegionsDirty) {
+        mVisibleRegionsDirty = false;
+        if (mTracingEnabled) {
+            mTracing.notify("visibleRegionsDirty");
+        }
+    }
 }
 
 
@@ -1810,9 +1816,6 @@
 
     if (mVisibleRegionsDirty) {
         computeLayerBounds();
-        if (mTracingEnabled) {
-            mTracing.notify("visibleRegionsDirty");
-        }
     }
 
     for (auto& layer : mLayersPendingRefresh) {
@@ -2214,7 +2217,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) {