Merge "Adds API to update InputDispatcher key repeat info." (25fb08af) · Commits · e / os / android_frameworks_native

services/inputflinger/benchmarks/InputDispatcher_benchmarks.cpp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -82,8 +82,6 @@ private:

	void notifyVibratorState(int32_t deviceId, bool isOn) override {}		void notifyVibratorState(int32_t deviceId, bool isOn) override {}

	InputDispatcherConfiguration getDispatcherConfiguration() override { return mConfig; }

	bool filterInputEvent(const InputEvent& inputEvent, uint32_t policyFlags) override {		bool filterInputEvent(const InputEvent& inputEvent, uint32_t policyFlags) override {
	return true; // dispatch event normally		return true; // dispatch event normally
	}		}

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -6740,13 +6740,6 @@ void InputDispatcher::cancelCurrentTouch() {
	mLooper->wake();		mLooper->wake();
	}		}

	void InputDispatcher::requestRefreshConfiguration() {
	InputDispatcherConfiguration config = mPolicy.getDispatcherConfiguration();

	std::scoped_lock _l(mLock);
	mConfig = config;
	}

	void InputDispatcher::setMonitorDispatchingTimeoutForTest(std::chrono::nanoseconds timeout) {		void InputDispatcher::setMonitorDispatchingTimeoutForTest(std::chrono::nanoseconds timeout) {
	std::scoped_lock _l(mLock);		std::scoped_lock _l(mLock);
	mMonitorDispatchingTimeout = timeout;		mMonitorDispatchingTimeout = timeout;
	@@ -6858,4 +6851,11 @@ sp<WindowInfoHandle> InputDispatcher::findWallpaperWindowBelow(
	return nullptr;		return nullptr;
	}		}

			void InputDispatcher::setKeyRepeatConfiguration(nsecs_t timeout, nsecs_t delay) {
			std::scoped_lock _l(mLock);

			mConfig.keyRepeatTimeout = timeout;
			mConfig.keyRepeatDelay = delay;
			}

	} // namespace android::inputdispatcher		} // namespace android::inputdispatcher

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -148,11 +148,11 @@ public:

	void cancelCurrentTouch() override;		void cancelCurrentTouch() override;

	void requestRefreshConfiguration() override;

	// Public to allow tests to verify that a Monitor can get ANR.		// Public to allow tests to verify that a Monitor can get ANR.
	void setMonitorDispatchingTimeoutForTest(std::chrono::nanoseconds timeout);		void setMonitorDispatchingTimeoutForTest(std::chrono::nanoseconds timeout);

			void setKeyRepeatConfiguration(nsecs_t timeout, nsecs_t delay) override;

	private:		private:
	enum class DropReason {		enum class DropReason {
	NOT_DROPPED,		NOT_DROPPED,

+3 −4

Original line number	Original line	Diff line number	Diff line
	@@ -226,11 +226,10 @@ public:
	*/		*/
	virtual void cancelCurrentTouch() = 0;		virtual void cancelCurrentTouch() = 0;

	/**		/*
	* Request that the InputDispatcher's configuration, which can be obtained through the policy,		* Updates key repeat configuration timeout and delay.
	* be updated.
	*/		*/
	virtual void requestRefreshConfiguration() = 0;		virtual void setKeyRepeatConfiguration(nsecs_t timeout, nsecs_t delay) = 0;
	};		};

	} // namespace android		} // namespace android

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -73,9 +73,6 @@ public:
	InputDeviceSensorAccuracy accuracy) = 0;		InputDeviceSensorAccuracy accuracy) = 0;
	virtual void notifyVibratorState(int32_t deviceId, bool isOn) = 0;		virtual void notifyVibratorState(int32_t deviceId, bool isOn) = 0;

	/* Gets the input dispatcher configuration. */
	virtual InputDispatcherConfiguration getDispatcherConfiguration() = 0;

	/* Filters an input event.		/* Filters an input event.
	* Return true to dispatch the event unmodified, false to consume the event.		* Return true to dispatch the event unmodified, false to consume the event.
	* A filter can also transform and inject events later by passing POLICY_FLAG_FILTERED		* A filter can also transform and inject events later by passing POLICY_FLAG_FILTERED