| commit | 747e5f771cf64437e82ece745bcd3c864b1eaf06 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 12 06:23:24 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 12 06:23:24 2022 +0000 |
| tree | 02b029fba599f1c44337d7c377988eb6d911c4fc | |
| parent | 93b15db88178c75b4f1e5bff255f45bfbbc74ef4 [diff] | |
| parent | 89d1093444f5bb88d6d222b80b1db44af53ce97c [diff] |
Merge "Do not handle VSync event during resolution switch" am: 03e4e9d9f5 am: 661fcfbcae am: 89d1093444 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1918376 Change-Id: I34408bc66c18f63e8a34611d9625becc5a2f44f7
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 758cc70..615af02 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1957,7 +1957,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) {