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

Commit 664834b6 authored by Prabir Pradhan's avatar Prabir Pradhan
Browse files

InputDispatcher: Remove transform only for joysticks and touchpads 

This partially reverts commit bd52771b.

Since window transforms can encode rotations, we need window transforms
for some non-pointer events such as relative mouse events. Joysticks and
touchapds are an exception to this, because neither expect their
reported values to be rotated. For this reason, we only remove window
transformations in InputDispatcher for these two types of devices.

The bug b/182325974 is now solved by selectively applying window
translations for pointer events in MotionEvent.

Bug: 182325974
Bug: 179274888
Test: atest inputflinger_tests
Test: manual with test app
Change-Id: I68a0c87f24a9ddea14e3078ad894410210e42b4a
parent 9f38881a

services/inputflinger/dispatcher/InputDispatcher.cpp

+4 −4
Original line number Diff line number Diff line
@@ -321,11 +321,11 @@ static std::unique_ptr<DispatchEntry> createDispatchEntry(const InputTarget& inp 
                                                          int32_t inputTargetFlags) {

    if (eventEntry->type == EventEntry::Type::MOTION) {

        const MotionEntry& motionEntry = static_cast<const MotionEntry&>(*eventEntry);

        if ((motionEntry.source & AINPUT_SOURCE_CLASS_POINTER) == 0) {

        if ((motionEntry.source & AINPUT_SOURCE_CLASS_JOYSTICK) ||

            (motionEntry.source & AINPUT_SOURCE_CLASS_POSITION)) {

            const ui::Transform identityTransform;

            // Use identity transform for events that are not pointer events because their axes

            // values do not represent on-screen coordinates, so they should not have any window

            // transformations applied to them.

            // Use identity transform for joystick and position-based (touchpad) events because they

            // don't depend on the window transform.

            return std::make_unique<DispatchEntry>(eventEntry, inputTargetFlags, identityTransform,

                                                   1.0f /*globalScaleFactor*/,

                                                   inputTarget.displaySize);

services/inputflinger/tests/InputDispatcher_test.cpp

+8 −9
Original line number Diff line number Diff line
@@ -2432,7 +2432,7 @@ TEST_F(InputDispatcherTest, VerifyInputEvent_MotionEvent) { 
    EXPECT_EQ(motionArgs.buttonState, verifiedMotion.buttonState);

}



TEST_F(InputDispatcherTest, NonPointerMotionEvent_NotTransformed) {

TEST_F(InputDispatcherTest, NonPointerMotionEvent_JoystickAndTouchpadNotTransformed) {

    std::shared_ptr<FakeApplicationHandle> application = std::make_shared<FakeApplicationHandle>();

    sp<FakeWindowHandle> window =

            new FakeWindowHandle(application, mDispatcher, "Test window", ADISPLAY_ID_DEFAULT);
@@ -2452,20 +2452,19 @@ TEST_F(InputDispatcherTest, NonPointerMotionEvent_NotTransformed) { 
    // Second, we consume focus event if it is right or wrong according to onFocusChangedLocked.

    window->consumeFocusEvent(true);



    constexpr const std::array nonPointerSources = {AINPUT_SOURCE_TRACKBALL,

                                                    AINPUT_SOURCE_MOUSE_RELATIVE,

                                                    AINPUT_SOURCE_JOYSTICK};

    for (const int source : nonPointerSources) {

        // Notify motion with a non-pointer source.

        NotifyMotionArgs motionArgs =

                generateMotionArgs(AMOTION_EVENT_ACTION_MOVE, source, ADISPLAY_ID_DEFAULT);

    constexpr const std::array nonTransformedSources = {std::pair(AINPUT_SOURCE_TOUCHPAD,

                                                                  AMOTION_EVENT_ACTION_DOWN),

                                                        std::pair(AINPUT_SOURCE_JOYSTICK,

                                                                  AMOTION_EVENT_ACTION_MOVE)};

    for (const auto& [source, action] : nonTransformedSources) {

        const NotifyMotionArgs motionArgs = generateMotionArgs(action, source, ADISPLAY_ID_DEFAULT);

        mDispatcher->notifyMotion(&motionArgs);



        MotionEvent* event = window->consumeMotion();

        ASSERT_NE(event, nullptr);



        const MotionEvent& motionEvent = *event;

        EXPECT_EQ(AMOTION_EVENT_ACTION_MOVE, motionEvent.getAction());

        EXPECT_EQ(action, motionEvent.getAction());

        EXPECT_EQ(motionArgs.pointerCount, motionEvent.getPointerCount());



        float expectedX = motionArgs.pointerCoords[0].getX();