Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61649950 authored by Harry Cutts's avatar Harry Cutts Committed by Automerger Merge Worker
Browse files

TouchInputMapper: don't check touchpad touches by screen bounds am: 1db43995 am: 8d984107 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23745905



Change-Id: Iec9b46ce34d93ad411f14969207a4f76b8487d62
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0dadd013 8d984107

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);