[RESTRICT AUTOMERGE] Send callbacks earlier am: 7687b3cd32 (14df9a0d) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2092,6 +2092,16 @@ void SurfaceFlinger::postComposition()
	}		}
	});		});

			mTransactionCompletedThread.addPresentFence(mPreviousPresentFences[0]);

			// Lock the mStateLock in case SurfaceFlinger is in the middle of applying a transaction.
			// If we do not lock here, a callback could be sent without all of its SurfaceControls and
			// metrics.
			{
			Mutex::Autolock _l(mStateLock);
			mTransactionCompletedThread.sendCallbacks();
			}

	if (presentFenceTime->isValid()) {		if (presentFenceTime->isValid()) {
	mScheduler->addPresentFence(presentFenceTime);		mScheduler->addPresentFence(presentFenceTime);
	}		}
	@@ -2163,16 +2173,6 @@ void SurfaceFlinger::postComposition()
	}		}
	}		}

	mTransactionCompletedThread.addPresentFence(mPreviousPresentFences[0]);

	// Lock the mStateLock in case SurfaceFlinger is in the middle of applying a transaction.
	// If we do not lock here, a callback could be sent without all of its SurfaceControls and
	// metrics.
	{
	Mutex::Autolock _l(mStateLock);
	mTransactionCompletedThread.sendCallbacks();
	}

	if (mLumaSampling && mRegionSamplingThread) {		if (mLumaSampling && mRegionSamplingThread) {
	mRegionSamplingThread->notifyNewContent();		mRegionSamplingThread->notifyNewContent();
	}		}