Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 747e5f77 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Do not handle VSync event during resolution switch" am: 03e4e9d9 am:... 

Merge "Do not handle VSync event during resolution switch" am: 03e4e9d9 am: 661fcfbc am: 89d10934

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

Change-Id: I34408bc66c18f63e8a34611d9625becc5a2f44f7
parents 93b15db8 89d10934

services/surfaceflinger/SurfaceFlinger.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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) {