Merge "Do not handle VSync event during resolution switch" (cdc2dbcf) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/SurfaceFlinger.cpp

+5 −3

Original line number	Diff line number	Diff line
		@@ -2066,7 +2066,10 @@ bool SurfaceFlinger::commit(nsecs_t frameTime, int64_t vsyncId, nsecs_t expected
		// 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 @@ bool SurfaceFlinger::commit(nsecs_t frameTime, int64_t vsyncId, nsecs_t expected
		{
		Mutex::Autolock _l(mStateLock);
		mScheduler->chooseRefreshRateForContent();
		setActiveModeInHwcIfNeeded();
		}

		ON_MAIN_THREAD(setActiveModeInHwcIfNeeded());

		updateCursorAsync();
		updateInputFlinger();