Merge "InputMapper: use a reference for InputDeviceInfo parameter" into udc-dev (66becf50) · Commits · e / os / platform_frameworks_native

services/inputflinger/reader/InputDevice.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -465,7 +465,7 @@ InputDeviceInfo InputDevice::getDeviceInfo() {
		mHasMic, getAssociatedDisplayId().value_or(ADISPLAY_ID_NONE));

		for_each_mapper(
		[&outDeviceInfo](InputMapper& mapper) { mapper.populateDeviceInfo(&outDeviceInfo); });
		[&outDeviceInfo](InputMapper& mapper) { mapper.populateDeviceInfo(outDeviceInfo); });

		if (mController) {
		mController->populateDeviceInfo(&outDeviceInfo);

services/inputflinger/reader/mapper/CursorInputMapper.cpp

+14 −14

Original line number	Diff line number	Diff line
		@@ -81,31 +81,31 @@ uint32_t CursorInputMapper::getSources() const {
		return mSource;
		}

		void CursorInputMapper::populateDeviceInfo(InputDeviceInfo* info) {
		void CursorInputMapper::populateDeviceInfo(InputDeviceInfo& info) {
		InputMapper::populateDeviceInfo(info);

		if (mParameters.mode == Parameters::Mode::POINTER) {
		if (const auto bounds = mPointerController->getBounds(); bounds) {
		info->addMotionRange(AMOTION_EVENT_AXIS_X, mSource, bounds->left, bounds->right, 0.0f,
		info.addMotionRange(AMOTION_EVENT_AXIS_X, mSource, bounds->left, bounds->right, 0.0f,
		0.0f, 0.0f);
		info->addMotionRange(AMOTION_EVENT_AXIS_Y, mSource, bounds->top, bounds->bottom, 0.0f,
		info.addMotionRange(AMOTION_EVENT_AXIS_Y, mSource, bounds->top, bounds->bottom, 0.0f,
		0.0f, 0.0f);
		}
		} else {
		info->addMotionRange(AMOTION_EVENT_AXIS_X, mSource, -1.0f, 1.0f, 0.0f, mXScale, 0.0f);
		info->addMotionRange(AMOTION_EVENT_AXIS_Y, mSource, -1.0f, 1.0f, 0.0f, mYScale, 0.0f);
		info->addMotionRange(AMOTION_EVENT_AXIS_RELATIVE_X, mSource, -1.0f, 1.0f, 0.0f, mXScale,
		info.addMotionRange(AMOTION_EVENT_AXIS_X, mSource, -1.0f, 1.0f, 0.0f, mXScale, 0.0f);
		info.addMotionRange(AMOTION_EVENT_AXIS_Y, mSource, -1.0f, 1.0f, 0.0f, mYScale, 0.0f);
		info.addMotionRange(AMOTION_EVENT_AXIS_RELATIVE_X, mSource, -1.0f, 1.0f, 0.0f, mXScale,
		0.0f);
		info->addMotionRange(AMOTION_EVENT_AXIS_RELATIVE_Y, mSource, -1.0f, 1.0f, 0.0f, mYScale,
		info.addMotionRange(AMOTION_EVENT_AXIS_RELATIVE_Y, mSource, -1.0f, 1.0f, 0.0f, mYScale,
		0.0f);
		}
		info->addMotionRange(AMOTION_EVENT_AXIS_PRESSURE, mSource, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f);
		info.addMotionRange(AMOTION_EVENT_AXIS_PRESSURE, mSource, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f);

		if (mCursorScrollAccumulator.haveRelativeVWheel()) {
		info->addMotionRange(AMOTION_EVENT_AXIS_VSCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
		info.addMotionRange(AMOTION_EVENT_AXIS_VSCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
		}
		if (mCursorScrollAccumulator.haveRelativeHWheel()) {
		info->addMotionRange(AMOTION_EVENT_AXIS_HSCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
		info.addMotionRange(AMOTION_EVENT_AXIS_HSCROLL, mSource, -1.0f, 1.0f, 0.0f, 0.0f, 0.0f);
		}
		}

services/inputflinger/reader/mapper/CursorInputMapper.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -57,7 +57,7 @@ public:
		virtual ~CursorInputMapper();

		virtual uint32_t getSources() const override;
		virtual void populateDeviceInfo(InputDeviceInfo* deviceInfo) override;
		virtual void populateDeviceInfo(InputDeviceInfo& deviceInfo) override;
		virtual void dump(std::string& dump) override;
		[[nodiscard]] std::list<NotifyArgs> configure(nsecs_t when,
		const InputReaderConfiguration* config,

services/inputflinger/reader/mapper/ExternalStylusInputMapper.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -30,10 +30,10 @@ uint32_t ExternalStylusInputMapper::getSources() const {
		return AINPUT_SOURCE_STYLUS;
		}

		void ExternalStylusInputMapper::populateDeviceInfo(InputDeviceInfo* info) {
		void ExternalStylusInputMapper::populateDeviceInfo(InputDeviceInfo& info) {
		InputMapper::populateDeviceInfo(info);
		if (mRawPressureAxis.valid) {
		info->addMotionRange(AMOTION_EVENT_AXIS_PRESSURE, AINPUT_SOURCE_STYLUS, 0.0f, 1.0f, 0.0f,
		info.addMotionRange(AMOTION_EVENT_AXIS_PRESSURE, AINPUT_SOURCE_STYLUS, 0.0f, 1.0f, 0.0f,
		0.0f, 0.0f);
		}
		}

services/inputflinger/reader/mapper/ExternalStylusInputMapper.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ public:
		virtual ~ExternalStylusInputMapper() = default;

		uint32_t getSources() const override;
		void populateDeviceInfo(InputDeviceInfo* deviceInfo) override;
		void populateDeviceInfo(InputDeviceInfo& deviceInfo) override;
		void dump(std::string& dump) override;
		[[nodiscard]] std::list<NotifyArgs> configure(nsecs_t when,
		const InputReaderConfiguration* config,