Snap for 5307677 from 101843de76cfd5a5b2c4cd8ffaf6f973f96c8c04 to qt-release (83518e9b) · Commits · e / os / android_frameworks_native

services/inputflinger/InputDispatcher.cpp

+3 −2

services/inputflinger/InputDispatcher.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -245,7 +245,8 @@ public:
	* This method is expected to set the POLICY_FLAG_PASS_TO_USER policy flag if the event		* This method is expected to set the POLICY_FLAG_PASS_TO_USER policy flag if the event
	* should be dispatched to applications.		* should be dispatched to applications.
	*/		*/
	virtual void interceptMotionBeforeQueueing(nsecs_t when, uint32_t& policyFlags) = 0;		virtual void interceptMotionBeforeQueueing(const int32_t displayId, nsecs_t when,
			uint32_t& policyFlags) = 0;

	/* Allows the policy a chance to intercept a key before dispatching. */		/* Allows the policy a chance to intercept a key before dispatching. */
	virtual nsecs_t interceptKeyBeforeDispatching(const sp<IBinder>& token,		virtual nsecs_t interceptKeyBeforeDispatching(const sp<IBinder>& token,

services/inputflinger/tests/InputDispatcher_test.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -138,7 +138,7 @@ private:
	virtual void interceptKeyBeforeQueueing(const KeyEvent*, uint32_t&) {		virtual void interceptKeyBeforeQueueing(const KeyEvent*, uint32_t&) {
	}		}

	virtual void interceptMotionBeforeQueueing(nsecs_t, uint32_t&) {		virtual void interceptMotionBeforeQueueing(int32_t, nsecs_t, uint32_t&) {
	}		}

	virtual nsecs_t interceptKeyBeforeDispatching(const sp<IBinder>&,		virtual nsecs_t interceptKeyBeforeDispatching(const sp<IBinder>&,

services/surfaceflinger/CompositionEngine/src/DisplayColorProfile.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -303,7 +303,7 @@ void DisplayColorProfile::populateColorModes(
	}		}

	// add all known HDR combinations		// add all known HDR combinations
	for (auto intent : sHdrRenderIntents) {		for (auto intent : hdrRenderIntents) {
	for (auto mode : sHdrColorModes) {		for (auto mode : sHdrColorModes) {
	addColorMode(hwcColorModes, mode, intent);		addColorMode(hwcColorModes, mode, intent);
	}		}

services/surfaceflinger/CompositionEngine/tests/DisplayColorProfileTest.cpp

+109 −111

File changed.

Preview size limit exceeded, changes collapsed.

Original line number	Original line	Diff line number	Diff line
	@@ -2673,7 +2673,7 @@ void InputDispatcher::notifyMotion(const NotifyMotionArgs* args) {
	policyFlags \|= POLICY_FLAG_TRUSTED;		policyFlags \|= POLICY_FLAG_TRUSTED;

	android::base::Timer t;		android::base::Timer t;
	mPolicy->interceptMotionBeforeQueueing(args->eventTime, /byref/ policyFlags);		mPolicy->interceptMotionBeforeQueueing(args->displayId, args->eventTime, /byref/ policyFlags);
	if (t.duration() > SLOW_INTERCEPTION_THRESHOLD) {		if (t.duration() > SLOW_INTERCEPTION_THRESHOLD) {
	ALOGW("Excessive delay in interceptMotionBeforeQueueing; took %s ms",		ALOGW("Excessive delay in interceptMotionBeforeQueueing; took %s ms",
	std::to_string(t.duration().count()).c_str());		std::to_string(t.duration().count()).c_str());
	@@ -2821,6 +2821,7 @@ int32_t InputDispatcher::injectInputEvent(const InputEvent* event,
	size_t pointerCount = motionEvent->getPointerCount();		size_t pointerCount = motionEvent->getPointerCount();
	const PointerProperties* pointerProperties = motionEvent->getPointerProperties();		const PointerProperties* pointerProperties = motionEvent->getPointerProperties();
	int32_t actionButton = motionEvent->getActionButton();		int32_t actionButton = motionEvent->getActionButton();
			int32_t displayId = motionEvent->getDisplayId();
	if (! validateMotionEvent(action, actionButton, pointerCount, pointerProperties)) {		if (! validateMotionEvent(action, actionButton, pointerCount, pointerProperties)) {
	return INPUT_EVENT_INJECTION_FAILED;		return INPUT_EVENT_INJECTION_FAILED;
	}		}
	@@ -2828,7 +2829,7 @@ int32_t InputDispatcher::injectInputEvent(const InputEvent* event,
	if (!(policyFlags & POLICY_FLAG_FILTERED)) {		if (!(policyFlags & POLICY_FLAG_FILTERED)) {
	nsecs_t eventTime = motionEvent->getEventTime();		nsecs_t eventTime = motionEvent->getEventTime();
	android::base::Timer t;		android::base::Timer t;
	mPolicy->interceptMotionBeforeQueueing(eventTime, /byref/ policyFlags);		mPolicy->interceptMotionBeforeQueueing(displayId, eventTime, /byref/ policyFlags);
	if (t.duration() > SLOW_INTERCEPTION_THRESHOLD) {		if (t.duration() > SLOW_INTERCEPTION_THRESHOLD) {
	ALOGW("Excessive delay in interceptMotionBeforeQueueing; took %s ms",		ALOGW("Excessive delay in interceptMotionBeforeQueueing; took %s ms",
	std::to_string(t.duration().count()).c_str());		std::to_string(t.duration().count()).c_str());