Merge "Add locks to InputDispatcher_test" into rvc-dev am: cc9a52824f (f587901d) · Commits · e / os / android_frameworks_native

services/inputflinger/dispatcher/Entry.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@ static std::string motionActionToString(int32_t action) {
		return "MOVE";
		case AMOTION_EVENT_ACTION_UP:
		return "UP";
		case AMOTION_EVENT_ACTION_CANCEL:
		return "CANCEL";
		case AMOTION_EVENT_ACTION_POINTER_DOWN:
		return "POINTER_DOWN";
		case AMOTION_EVENT_ACTION_POINTER_UP:
		@@ -57,6 +59,7 @@ static std::string keyActionToString(int32_t action) {
		}
		return StringPrintf("%" PRId32, action);
		}

		VerifiedKeyEvent verifiedKeyEventFromKeyEntry(const KeyEntry& entry) {
		return {{VerifiedInputEvent::Type::KEY, entry.deviceId, entry.eventTime, entry.source,
		entry.displayId},

services/inputflinger/include/InputListener.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		#include <input/Input.h>
		#include <input/TouchVideoFrame.h>
		#include <utils/RefBase.h>
		#include <utils/Vector.h>

		namespace android {

services/inputflinger/tests/InputDispatcher_test.cpp

+19 −6

Original line number	Diff line number	Diff line
		@@ -83,9 +83,13 @@ public:
		args.displayId);
		}

		void assertFilterInputEventWasNotCalled() { ASSERT_EQ(nullptr, mFilteredEvent); }
		void assertFilterInputEventWasNotCalled() {
		std::scoped_lock lock(mLock);
		ASSERT_EQ(nullptr, mFilteredEvent);
		}

		void assertNotifyConfigurationChangedWasCalled(nsecs_t when) {
		std::scoped_lock lock(mLock);
		ASSERT_TRUE(mConfigurationChangedTime)
		<< "Timed out waiting for configuration changed call";
		ASSERT_EQ(*mConfigurationChangedTime, when);
		@@ -93,6 +97,7 @@ public:
		}

		void assertNotifySwitchWasCalled(const NotifySwitchArgs& args) {
		std::scoped_lock lock(mLock);
		ASSERT_TRUE(mLastNotifySwitch);
		// We do not check id because it is not exposed to the policy
		EXPECT_EQ(args.eventTime, mLastNotifySwitch->eventTime);
		@@ -103,11 +108,13 @@ public:
		}

		void assertOnPointerDownEquals(const sp<IBinder>& touchedToken) {
		std::scoped_lock lock(mLock);
		ASSERT_EQ(touchedToken, mOnPointerDownToken);
		mOnPointerDownToken.clear();
		}

		void assertOnPointerDownWasNotCalled() {
		std::scoped_lock lock(mLock);
		ASSERT_TRUE(mOnPointerDownToken == nullptr)
		<< "Expected onPointerDownOutsideFocus to not have been called";
		}
		@@ -118,12 +125,14 @@ public:
		}

		private:
		std::unique_ptr<InputEvent> mFilteredEvent;
		std::optional<nsecs_t> mConfigurationChangedTime;
		sp<IBinder> mOnPointerDownToken;
		std::optional<NotifySwitchArgs> mLastNotifySwitch;
		std::mutex mLock;
		std::unique_ptr<InputEvent> mFilteredEvent GUARDED_BY(mLock);
		std::optional<nsecs_t> mConfigurationChangedTime GUARDED_BY(mLock);
		sp<IBinder> mOnPointerDownToken GUARDED_BY(mLock);
		std::optional<NotifySwitchArgs> mLastNotifySwitch GUARDED_BY(mLock);

		virtual void notifyConfigurationChanged(nsecs_t when) override {
		std::scoped_lock lock(mLock);
		mConfigurationChangedTime = when;
		}

		@@ -141,6 +150,7 @@ private:
		}

		virtual bool filterInputEvent(const InputEvent* inputEvent, uint32_t policyFlags) override {
		std::scoped_lock lock(mLock);
		switch (inputEvent->getType()) {
		case AINPUT_EVENT_TYPE_KEY: {
		const KeyEvent* keyEvent = static_cast<const KeyEvent*>(inputEvent);
		@@ -173,6 +183,7 @@ private:

		virtual void notifySwitch(nsecs_t when, uint32_t switchValues, uint32_t switchMask,
		uint32_t policyFlags) override {
		std::scoped_lock lock(mLock);
		/** We simply reconstruct NotifySwitchArgs in policy because InputDispatcher is
		* essentially a passthrough for notifySwitch.
		*/
		@@ -186,11 +197,13 @@ private:
		}

		virtual void onPointerDownOutsideFocus(const sp<IBinder>& newToken) override {
		std::scoped_lock lock(mLock);
		mOnPointerDownToken = newToken;
		}

		void assertFilterInputEventWasCalled(int type, nsecs_t eventTime, int32_t action,
		int32_t displayId) {
		std::scoped_lock lock(mLock);
		ASSERT_NE(nullptr, mFilteredEvent) << "Expected filterInputEvent() to have been called.";
		ASSERT_EQ(mFilteredEvent->getType(), type);

		@@ -485,7 +498,7 @@ TEST_F(InputDispatcherTest, NotifySwitch_CallsPolicy) {

		// --- InputDispatcherTest SetInputWindowTest ---
		static constexpr std::chrono::duration INJECT_EVENT_TIMEOUT = 500ms;
		static constexpr std::chrono::duration DISPATCHING_TIMEOUT = 5s;
		static constexpr std::chrono::nanoseconds DISPATCHING_TIMEOUT = 5s;

		class FakeApplicationHandle : public InputApplicationHandle {
		public: