Snap for 8788209 from 7e9fa6ea2b3ef76afe93ebd54ac9ef774ee39afb to tm-qpr1-release (27b8dec4) · Commits · e / os / platform_frameworks_native

libs/input/Input.cpp

+3 −2

Original line number	Diff line number	Diff line
		@@ -64,9 +64,10 @@ float transformAngle(const ui::Transform& transform, float angleRadians) {
		}

		bool shouldDisregardTransformation(uint32_t source) {
		// Do not apply any transformations to axes from joysticks or touchpads.
		// Do not apply any transformations to axes from joysticks, touchpads, or relative mice.
		return isFromSource(source, AINPUT_SOURCE_CLASS_JOYSTICK) \|\|
		isFromSource(source, AINPUT_SOURCE_CLASS_POSITION);
		isFromSource(source, AINPUT_SOURCE_CLASS_POSITION) \|\|
		isFromSource(source, AINPUT_SOURCE_MOUSE_RELATIVE);
		}

		bool shouldDisregardOffset(uint32_t source) {

libs/input/tests/InputEvent_test.cpp

+5 −5

Original line number	Diff line number	Diff line
		@@ -715,10 +715,10 @@ TEST_F(MotionEventTest, ApplyTransform) {
		}

		TEST_F(MotionEventTest, JoystickAndTouchpadAreNotTransformed) {
		constexpr static std::array kNonTransformedSources = {std::pair(AINPUT_SOURCE_TOUCHPAD,
		AMOTION_EVENT_ACTION_DOWN),
		std::pair(AINPUT_SOURCE_JOYSTICK,
		AMOTION_EVENT_ACTION_MOVE)};
		constexpr static std::array kNonTransformedSources =
		{std::pair(AINPUT_SOURCE_TOUCHPAD, AMOTION_EVENT_ACTION_DOWN),
		std::pair(AINPUT_SOURCE_JOYSTICK, AMOTION_EVENT_ACTION_MOVE),
		std::pair(AINPUT_SOURCE_MOUSE_RELATIVE, AMOTION_EVENT_ACTION_MOVE)};
		// Create a rotate-90 transform with an offset (like a window which isn't fullscreen).
		ui::Transform transform(ui::Transform::ROT_90, 800, 400);
		transform.set(transform.tx() + 20, transform.ty() + 40);
		@@ -738,7 +738,7 @@ TEST_F(MotionEventTest, JoystickAndTouchpadAreNotTransformed) {
		TEST_F(MotionEventTest, NonPointerSourcesAreNotTranslated) {
		constexpr static std::array kNonPointerSources = {std::pair(AINPUT_SOURCE_TRACKBALL,
		AMOTION_EVENT_ACTION_DOWN),
		std::pair(AINPUT_SOURCE_MOUSE_RELATIVE,
		std::pair(AINPUT_SOURCE_TOUCH_NAVIGATION,
		AMOTION_EVENT_ACTION_MOVE)};
		// Create a rotate-90 transform with an offset (like a window which isn't fullscreen).
		ui::Transform transform(ui::Transform::ROT_90, 800, 400);

services/inputflinger/reader/mapper/CursorInputMapper.cpp

+24 −35

Original line number	Diff line number	Diff line
		@@ -76,7 +76,7 @@ uint32_t CursorInputMapper::getSources() const {
		void CursorInputMapper::populateDeviceInfo(InputDeviceInfo* info) {
		InputMapper::populateDeviceInfo(info);

		if (mParameters.mode == Parameters::MODE_POINTER) {
		if (mParameters.mode == Parameters::Mode::POINTER) {
		float minX, minY, maxX, maxY;
		if (mPointerController->getBounds(&minX, &minY, &maxX, &maxY)) {
		info->addMotionRange(AMOTION_EVENT_AXIS_X, mSource, minX, maxX, 0.0f, 0.0f, 0.0f);
		@@ -131,12 +131,12 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration*

		// Configure device mode.
		switch (mParameters.mode) {
		case Parameters::MODE_POINTER_RELATIVE:
		case Parameters::Mode::POINTER_RELATIVE:
		// Should not happen during first time configuration.
		ALOGE("Cannot start a device in MODE_POINTER_RELATIVE, starting in MODE_POINTER");
		mParameters.mode = Parameters::MODE_POINTER;
		mParameters.mode = Parameters::Mode::POINTER;
		[[fallthrough]];
		case Parameters::MODE_POINTER:
		case Parameters::Mode::POINTER:
		mSource = AINPUT_SOURCE_MOUSE;
		mXPrecision = 1.0f;
		mYPrecision = 1.0f;
		@@ -144,7 +144,7 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration*
		mYScale = 1.0f;
		mPointerController = getContext()->getPointerController(getDeviceId());
		break;
		case Parameters::MODE_NAVIGATION:
		case Parameters::Mode::NAVIGATION:
		mSource = AINPUT_SOURCE_TRACKBALL;
		mXPrecision = TRACKBALL_MOVEMENT_THRESHOLD;
		mYPrecision = TRACKBALL_MOVEMENT_THRESHOLD;
		@@ -157,12 +157,13 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration*
		mHWheelScale = 1.0f;
		}

		const bool configurePointerCapture = (!changes && config->pointerCaptureRequest.enable) \|\|
		(changes & InputReaderConfiguration::CHANGE_POINTER_CAPTURE);
		const bool configurePointerCapture = mParameters.mode != Parameters::Mode::NAVIGATION &&
		((!changes && config->pointerCaptureRequest.enable) \|\|
		(changes & InputReaderConfiguration::CHANGE_POINTER_CAPTURE));
		if (configurePointerCapture) {
		if (config->pointerCaptureRequest.enable) {
		if (mParameters.mode == Parameters::MODE_POINTER) {
		mParameters.mode = Parameters::MODE_POINTER_RELATIVE;
		if (mParameters.mode == Parameters::Mode::POINTER) {
		mParameters.mode = Parameters::Mode::POINTER_RELATIVE;
		mSource = AINPUT_SOURCE_MOUSE_RELATIVE;
		// Keep PointerController around in order to preserve the pointer position.
		mPointerController->fade(PointerControllerInterface::Transition::IMMEDIATE);
		@@ -170,8 +171,8 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration*
		ALOGE("Cannot request pointer capture, device is not in MODE_POINTER");
		}
		} else {
		if (mParameters.mode == Parameters::MODE_POINTER_RELATIVE) {
		mParameters.mode = Parameters::MODE_POINTER;
		if (mParameters.mode == Parameters::Mode::POINTER_RELATIVE) {
		mParameters.mode = Parameters::Mode::POINTER;
		mSource = AINPUT_SOURCE_MOUSE;
		} else {
		ALOGE("Cannot release pointer capture, device is not in MODE_POINTER_RELATIVE");
		@@ -186,8 +187,8 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration*

		if (!changes \|\| (changes & InputReaderConfiguration::CHANGE_POINTER_SPEED) \|\|
		configurePointerCapture) {
		if (config->pointerCaptureRequest.enable) {
		// Disable any acceleration or scaling when Pointer Capture is enabled.
		if (mParameters.mode == Parameters::Mode::POINTER_RELATIVE) {
		// Disable any acceleration or scaling for the pointer when Pointer Capture is enabled.
		mPointerVelocityControl.setParameters(FLAT_VELOCITY_CONTROL_PARAMS);
		mWheelXVelocityControl.setParameters(FLAT_VELOCITY_CONTROL_PARAMS);
		mWheelYVelocityControl.setParameters(FLAT_VELOCITY_CONTROL_PARAMS);
		@@ -198,7 +199,8 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration*
		}
		}

		if (!changes \|\| (changes & InputReaderConfiguration::CHANGE_DISPLAY_INFO)) {
		if (!changes \|\| (changes & InputReaderConfiguration::CHANGE_DISPLAY_INFO) \|\|
		configurePointerCapture) {
		mOrientation = DISPLAY_ORIENTATION_0;
		const bool isOrientedDevice =
		(mParameters.orientationAware && mParameters.hasAssociatedDisplay);
		@@ -207,8 +209,9 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration*
		// anything if the device is already orientation-aware. If the device is not
		// orientation-aware, then we need to apply the inverse rotation of the display so that
		// when the display rotation is applied later as a part of the per-window transform, we
		// get the expected screen coordinates.
		if (!isOrientedDevice) {
		// get the expected screen coordinates. When pointer capture is enabled, we do not apply any
		// rotations and report values directly from the input device.
		if (!isOrientedDevice && mParameters.mode != Parameters::Mode::POINTER_RELATIVE) {
		std::optional<DisplayViewport> internalViewport =
		config->getDisplayViewportByType(ViewportType::INTERNAL);
		if (internalViewport) {
		@@ -221,12 +224,12 @@ void CursorInputMapper::configure(nsecs_t when, const InputReaderConfiguration*
		}

		void CursorInputMapper::configureParameters() {
		mParameters.mode = Parameters::MODE_POINTER;
		mParameters.mode = Parameters::Mode::POINTER;
		String8 cursorModeString;
		if (getDeviceContext().getConfiguration().tryGetProperty(String8("cursor.mode"),
		cursorModeString)) {
		if (cursorModeString == "navigation") {
		mParameters.mode = Parameters::MODE_NAVIGATION;
		mParameters.mode = Parameters::Mode::NAVIGATION;
		} else if (cursorModeString != "pointer" && cursorModeString != "default") {
		ALOGW("Invalid value for cursor.mode: '%s'", cursorModeString.string());
		}
		@@ -237,7 +240,7 @@ void CursorInputMapper::configureParameters() {
		mParameters.orientationAware);

		mParameters.hasAssociatedDisplay = false;
		if (mParameters.mode == Parameters::MODE_POINTER \|\| mParameters.orientationAware) {
		if (mParameters.mode == Parameters::Mode::POINTER \|\| mParameters.orientationAware) {
		mParameters.hasAssociatedDisplay = true;
		}
		}
		@@ -246,21 +249,7 @@ void CursorInputMapper::dumpParameters(std::string& dump) {
		dump += INDENT3 "Parameters:\n";
		dump += StringPrintf(INDENT4 "HasAssociatedDisplay: %s\n",
		toString(mParameters.hasAssociatedDisplay));

		switch (mParameters.mode) {
		case Parameters::MODE_POINTER:
		dump += INDENT4 "Mode: pointer\n";
		break;
		case Parameters::MODE_POINTER_RELATIVE:
		dump += INDENT4 "Mode: relative pointer\n";
		break;
		case Parameters::MODE_NAVIGATION:
		dump += INDENT4 "Mode: navigation\n";
		break;
		default:
		ALOG_ASSERT(false);
		}

		dump += StringPrintf(INDENT4 "Mode: %s\n", ftl::enum_string(mParameters.mode).c_str());
		dump += StringPrintf(INDENT4 "OrientationAware: %s\n", toString(mParameters.orientationAware));
		}

		@@ -486,7 +475,7 @@ int32_t CursorInputMapper::getScanCodeState(uint32_t sourceMask, int32_t scanCod

		std::optional<int32_t> CursorInputMapper::getAssociatedDisplayId() {
		if (mParameters.hasAssociatedDisplay) {
		if (mParameters.mode == Parameters::MODE_POINTER) {
		if (mParameters.mode == Parameters::Mode::POINTER) {
		return std::make_optional(mPointerController->getDisplayId());
		} else {
		// If the device is orientationAware and not a mouse,

services/inputflinger/reader/mapper/CursorInputMapper.h

+11 −4

Original line number	Diff line number	Diff line
		@@ -74,10 +74,17 @@ private:

		// Immutable configuration parameters.
		struct Parameters {
		enum Mode {
		MODE_POINTER,
		MODE_POINTER_RELATIVE,
		MODE_NAVIGATION,
		enum class Mode {
		// In POINTER mode, the device is a mouse that controls the mouse cursor on the screen,
		// reporting absolute screen locations using SOURCE_MOUSE.
		POINTER,
		// A mouse device in POINTER mode switches to the POINTER_RELATIVE mode when Pointer
		// Capture is enabled, and reports relative values only using SOURCE_MOUSE_RELATIVE.
		POINTER_RELATIVE,
		// A device in NAVIGATION mode emits relative values using SOURCE_TRACKBALL.
		NAVIGATION,

		ftl_last = NAVIGATION,
		};

		Mode mode;

services/inputflinger/tests/InputReader_test.cpp

+42 −0

Original line number	Diff line number	Diff line
		@@ -4969,6 +4969,48 @@ TEST_F(CursorInputMapperTest, PointerCaptureDisablesVelocityProcessing) {
		ASSERT_EQ(20, args.pointerCoords[0].getY());
		}

		TEST_F(CursorInputMapperTest, PointerCaptureDisablesOrientationChanges) {
		addConfigurationProperty("cursor.mode", "pointer");
		CursorInputMapper& mapper = addMapperAndConfigure<CursorInputMapper>();

		NotifyDeviceResetArgs resetArgs;
		ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyDeviceResetWasCalled(&resetArgs));
		ASSERT_EQ(ARBITRARY_TIME, resetArgs.eventTime);
		ASSERT_EQ(DEVICE_ID, resetArgs.deviceId);

		// Ensure the display is rotated.
		prepareDisplay(DISPLAY_ORIENTATION_90);

		NotifyMotionArgs args;

		// Verify that the coordinates are rotated.
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_REL, REL_X, 10);
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_REL, REL_Y, 20);
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_SYN, SYN_REPORT, 0);
		ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&args));
		ASSERT_EQ(AINPUT_SOURCE_MOUSE, args.source);
		ASSERT_EQ(AMOTION_EVENT_ACTION_HOVER_MOVE, args.action);
		ASSERT_EQ(-20, args.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_X));
		ASSERT_EQ(10, args.pointerCoords[0].getAxisValue(AMOTION_EVENT_AXIS_RELATIVE_Y));

		// Enable Pointer Capture.
		mFakePolicy->setPointerCapture(true);
		configureDevice(InputReaderConfiguration::CHANGE_POINTER_CAPTURE);
		NotifyPointerCaptureChangedArgs captureArgs;
		ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyCaptureWasCalled(&captureArgs));
		ASSERT_TRUE(captureArgs.request.enable);

		// Move and verify rotation is not applied.
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_REL, REL_X, 10);
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_REL, REL_Y, 20);
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_SYN, SYN_REPORT, 0);
		ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&args));
		ASSERT_EQ(AINPUT_SOURCE_MOUSE_RELATIVE, args.source);
		ASSERT_EQ(AMOTION_EVENT_ACTION_MOVE, args.action);
		ASSERT_EQ(10, args.pointerCoords[0].getX());
		ASSERT_EQ(20, args.pointerCoords[0].getY());
		}

		TEST_F(CursorInputMapperTest, Process_ShouldHandleDisplayId) {
		CursorInputMapper& mapper = addMapperAndConfigure<CursorInputMapper>();