Merge "InputMapper refactor: ExternalStylusInputMapper" (ea65a36e) · Commits · e / os / android_frameworks_native

services/inputflinger/reader/InputDevice.cpp

+1 −1

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

		// External stylus-like devices.
		if (classes.test(InputDeviceClass::EXTERNAL_STYLUS)) {
		mappers.push_back(std::make_unique<ExternalStylusInputMapper>(contextPtr, readerConfig));
		mappers.push_back(createInputMapper<ExternalStylusInputMapper>(contextPtr, readerConfig));
		}
		return mappers;
		}

+6 −2

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

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

		uint32_t getSources() const override;
		@@ -46,6 +48,8 @@ private:

		StylusState mStylusState;

		explicit ExternalStylusInputMapper(InputDeviceContext& deviceContext,
		const InputReaderConfiguration& readerConfig);
		[[nodiscard]] std::list<NotifyArgs> sync(nsecs_t when);
		};