commit 89d1093444f5bb88d6d222b80b1db44af53ce97c
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 12 06:05:16 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 12 06:05:16 2022 +0000
tree a8ab2eb2fcd1365103789028de5e04a41b8ddd77
parent 2bf48fec4e6c4e03cc09f364a4f9dff4d3a89166
parent 661fcfbcae33d988aff95c33df7a1449f7bb6e36

Merge "Do not handle VSync event during resolution switch" am: 03e4e9d9f5 am: 661fcfbcae

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1918376

Change-Id: If7ec8a47b1ee75dd59a4a37464c44d67e59e42b4

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) {