commit 03e4e9d9f590b2cb4d342ea573a834fa093f5ee8
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 12 05:30:29 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 12 05:30:29 2022 +0000
tree 2ab5e4d918eeaeeb046f4f0ca58af5575d30acc8
parent 5d9e175e821cdffeac39267ef167d83f35c7ce88
parent 57fc3d60dc96e8542b0b1fd89e89dcd402e01460

Merge "Do not handle VSync event during resolution switch"

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 6b5094f..fabb3fe 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1960,7 +1960,10 @@
         // We received the present fence from the HWC, so we assume it successfully updated
         // the mode, hence we update SF.
         mSetActiveModePending = false;
-        ON_MAIN_THREAD(setActiveModeInternal());
+        {
+            Mutex::Autolock lock(mStateLock);
+            setActiveModeInternal();
+        }
     }
 
     if (framePending) {