commit cdc2dbcfc6845062e863c51a87aa57e222131d1f
author Ady Abraham <adyabr@google.com> Sat Jan 08 00:45:04 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jan 08 00:45:04 2022 +0000
tree 01a581a89ef90b6a66d6a0cd02086426885ec956
parent a58fbee2c3efdab47ef629c637fa2550621c199f
parent 087d37481ea16f33f7e344b1ea184e51c667fda7

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 58fe0ac..b8902a4 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -2066,7 +2066,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(updateInternalStateWithChangedMode());
+        {
+            Mutex::Autolock lock(mStateLock);
+            updateInternalStateWithChangedMode();
+        }
     }
 
     if (framePending) {
@@ -2131,10 +2134,9 @@
     {
         Mutex::Autolock _l(mStateLock);
         mScheduler->chooseRefreshRateForContent();
+        setActiveModeInHwcIfNeeded();
     }
 
-    ON_MAIN_THREAD(setActiveModeInHwcIfNeeded());
-
     updateCursorAsync();
     updateInputFlinger();