Snap for 5476769 from e8abff06f4946bb15def52959c5be15c8b380917 to qt-release (0fef5c5c) · Commits · e / os / android_frameworks_native

libs/gui/BufferQueueProducer.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -1007,14 +1007,6 @@ status_t BufferQueueProducer::queueBuffer(int slot,
		mCallbackCondition.notify_all();
		}

		// Wait without lock held
		if (connectedApi == NATIVE_WINDOW_API_EGL) {
		// Waiting here allows for two full buffers to be queued but not a
		// third. In the event that frames take varying time, this makes a
		// small trade-off in favor of latency rather than throughput.
		lastQueuedFence->waitForever("Throttling EGL Production");
		}

		// Update and get FrameEventHistory.
		nsecs_t postedTime = systemTime(SYSTEM_TIME_MONOTONIC);
		NewFrameEventsEntry newFrameEventsEntry = {
		@@ -1026,6 +1018,14 @@ status_t BufferQueueProducer::queueBuffer(int slot,
		addAndGetFrameTimestamps(&newFrameEventsEntry,
		getFrameTimestamps ? &output->frameTimestamps : nullptr);

		// Wait without lock held
		if (connectedApi == NATIVE_WINDOW_API_EGL) {
		// Waiting here allows for two full buffers to be queued but not a
		// third. In the event that frames take varying time, this makes a
		// small trade-off in favor of latency rather than throughput.
		lastQueuedFence->waitForever("Throttling EGL Production");
		}

		return NO_ERROR;
		}

libs/input/VelocityTracker.cpp

+20 −2

Original line number	Diff line number	Diff line
		@@ -382,7 +382,16 @@ void LeastSquaresVelocityTrackerStrategy::clearPointers(BitSet32 idBits) {

		void LeastSquaresVelocityTrackerStrategy::addMovement(nsecs_t eventTime, BitSet32 idBits,
		const VelocityTracker::Position* positions) {
		if (++mIndex == HISTORY_SIZE) {
		if (mMovements[mIndex].eventTime != eventTime) {
		// When ACTION_POINTER_DOWN happens, we will first receive ACTION_MOVE with the coordinates
		// of the existing pointers, and then ACTION_POINTER_DOWN with the coordinates that include
		// the new pointer. If the eventtimes for both events are identical, just update the data
		// for this time.
		// We only compare against the last value, as it is likely that addMovement is called
		// in chronological order as events occur.
		mIndex++;
		}
		if (mIndex == HISTORY_SIZE) {
		mIndex = 0;
		}

		@@ -1017,7 +1026,16 @@ void ImpulseVelocityTrackerStrategy::clearPointers(BitSet32 idBits) {

		void ImpulseVelocityTrackerStrategy::addMovement(nsecs_t eventTime, BitSet32 idBits,
		const VelocityTracker::Position* positions) {
		if (++mIndex == HISTORY_SIZE) {
		if (mMovements[mIndex].eventTime != eventTime) {
		// When ACTION_POINTER_DOWN happens, we will first receive ACTION_MOVE with the coordinates
		// of the existing pointers, and then ACTION_POINTER_DOWN with the coordinates that include
		// the new pointer. If the eventtimes for both events are identical, just update the data
		// for this time.
		// We only compare against the last value, as it is likely that addMovement is called
		// in chronological order as events occur.
		mIndex++;
		}
		if (mIndex == HISTORY_SIZE) {
		mIndex = 0;
		}