Snap for 10353861 from 1db43995a5e1cda14aaa1079bbcd39a1c8ccb8fc to udc-release (b13e81f8) · Commits · e / os / platform_frameworks_native

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -1889,9 +1889,9 @@ std::list<NotifyArgs> TouchInputMapper::consumeRawTouches(nsecs_t when, nsecs_t
		uint32_t id = mCurrentRawState.rawPointerData.touchingIdBits.firstMarkedBit();
		const RawPointerData::Pointer& pointer = mCurrentRawState.rawPointerData.pointerForId(id);
		// Skip checking whether the pointer is inside the physical frame if the device is in
		// unscaled mode.
		// unscaled or pointer mode.
		if (!isPointInsidePhysicalFrame(pointer.x, pointer.y) &&
		mDeviceMode != DeviceMode::UNSCALED) {
		mDeviceMode != DeviceMode::UNSCALED && mDeviceMode != DeviceMode::POINTER) {
		// If exactly one pointer went down, check for virtual key hit.
		// Otherwise, we will drop the entire stroke.
		if (mCurrentRawState.rawPointerData.touchingIdBits.count() == 1) {

services/inputflinger/tests/InputReader_test.cpp

+34 −0

Original line number	Diff line number	Diff line
		@@ -5903,6 +5903,40 @@ TEST_F(SingleTouchInputMapperTest, Process_IgnoresTouchesOutsidePhysicalFrame) {
		mFakeListener->assertNotifyMotionWasCalled(WithMotionAction(AMOTION_EVENT_ACTION_UP)));
		}

		TEST_F(SingleTouchInputMapperTest, Process_DoesntCheckPhysicalFrameForTouchpads) {
		std::shared_ptr<FakePointerController> fakePointerController =
		std::make_shared<FakePointerController>();
		mFakePolicy->setPointerController(fakePointerController);

		addConfigurationProperty("touch.deviceType", "pointer");
		prepareAxes(POSITION);
		prepareDisplay(ui::ROTATION_0);
		auto& mapper = constructAndAddMapper<SingleTouchInputMapper>();

		// Set a physical frame in the display viewport.
		auto viewport = mFakePolicy->getDisplayViewportByType(ViewportType::INTERNAL);
		viewport->physicalLeft = 20;
		viewport->physicalTop = 600;
		viewport->physicalRight = 30;
		viewport->physicalBottom = 610;
		mFakePolicy->updateViewport(*viewport);
		configureDevice(InputReaderConfiguration::Change::DISPLAY_INFO);

		// Start the touch.
		process(mapper, ARBITRARY_TIME, READ_TIME, EV_KEY, BTN_TOUCH, 1);
		processSync(mapper);

		// Expect all input starting outside the physical frame to result in NotifyMotionArgs being
		// produced.
		const std::array<Point, 6> outsidePoints = {
		{{0, 0}, {19, 605}, {31, 605}, {25, 599}, {25, 611}, {DISPLAY_WIDTH, DISPLAY_HEIGHT}}};
		for (const auto& p : outsidePoints) {
		processMove(mapper, toRawX(p.x), toRawY(p.y));
		processSync(mapper);
		EXPECT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled());
		}
		}

		TEST_F(SingleTouchInputMapperTest, Process_AllAxes_DefaultCalibration) {
		addConfigurationProperty("touch.deviceType", "touchScreen");
		prepareDisplay(ui::ROTATION_0);