Merge "InputMapper refactor: JoystickInputMapper" (bfb16023) · Commits · e / os / android_frameworks_native

services/inputflinger/reader/InputDevice.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -510,7 +510,7 @@ std::vector<std::unique_ptr<InputMapper>> InputDevice::createMappers(

		// Joystick-like devices.
		if (classes.test(InputDeviceClass::JOYSTICK)) {
		mappers.push_back(std::make_unique<JoystickInputMapper>(contextPtr, readerConfig));
		mappers.push_back(createInputMapper<JoystickInputMapper>(contextPtr, readerConfig));
		}

		// Motion sensor enabled devices.

+7 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,10 @@ namespace android {

		class JoystickInputMapper : public InputMapper {
		public:
		explicit JoystickInputMapper(InputDeviceContext& deviceContext,
		const InputReaderConfiguration& readerConfig);
		template <class T, class... Args>
		friend std::unique_ptr<T> createInputMapper(InputDeviceContext& deviceContext,
		const InputReaderConfiguration& readerConfig,
		Args... args);
		virtual ~JoystickInputMapper();

		virtual uint32_t getSources() const override;
		@@ -87,6 +89,9 @@ private:
		}
		};

		explicit JoystickInputMapper(InputDeviceContext& deviceContext,
		const InputReaderConfiguration& readerConfig);

		static Axis createAxis(const AxisInfo& AxisInfo, const RawAbsoluteAxisInfo& rawAxisInfo,
		bool explicitlyMapped);

+1 −1

Original line number	Diff line number	Diff line
		@@ -10917,7 +10917,7 @@ const int32_t JoystickInputMapperTest::RAW_Y_MAX = 32767;

		TEST_F(JoystickInputMapperTest, Configure_AssignsDisplayUniqueId) {
		prepareAxes();
		JoystickInputMapper& mapper = addMapperAndConfigure<JoystickInputMapper>();
		JoystickInputMapper& mapper = constructAndAddMapper<JoystickInputMapper>();

		mFakePolicy->addInputUniqueIdAssociation(DEVICE_LOCATION, VIRTUAL_DISPLAY_UNIQUE_ID);