diff options
| author | 2022-01-12 06:23:24 +0000 | |
|---|---|---|
| committer | 2022-01-12 06:23:24 +0000 | |
| commit | 747e5f771cf64437e82ece745bcd3c864b1eaf06 (patch) | |
| tree | 02b029fba599f1c44337d7c377988eb6d911c4fc /services/surfaceflinger/SurfaceFlinger.cpp | |
| 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
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
| -rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 758cc705f9..615af02f06 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -1957,7 +1957,10 @@ void SurfaceFlinger::onMessageInvalidate(int64_t vsyncId, nsecs_t expectedVSyncT // 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) { |