Merge "[AChoreographer] Resolves a deadlock" into rvc-dev am: a821321b90 am:... (cb4aaaa2) · Commits · e / os / android_frameworks_native

libs/nativedisplay/AChoreographer.cpp

+12 −3

Original line number	Diff line number	Diff line
		@@ -185,9 +185,18 @@ void Choreographer::unregisterRefreshRateCallback(AChoreographer_refreshRateCall
		}

		void Choreographer::scheduleCallbacks() {
		const nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);
		nsecs_t dueTime;
		{
		AutoMutex _{mLock};
		nsecs_t now = systemTime(SYSTEM_TIME_MONOTONIC);
		if (mFrameCallbacks.top().dueTime <= now) {
		// If there are no pending callbacks then don't schedule a vsync
		if (mFrameCallbacks.empty()) {
		return;
		}
		dueTime = mFrameCallbacks.top().dueTime;
		}

		if (dueTime <= now) {
		ALOGV("choreographer %p ~ scheduling vsync", this);
		scheduleVsync();
		return;