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

Commit 7f02bd59 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I48ef7ca0,I93b9a14d,Ic5e328f0 into main 

* changes:
  Add tests to verify hover enter and exit are synthesized correctly
  FakeMonitorReceiver: Take dispatcher param as reference
  Cancel drag and drop when pointers are canceled for the drag window
parents 0a373297 0dfcac7c

services/inputflinger/dispatcher/InputDispatcher.cpp

+10 −0
Original line number Diff line number Diff line
@@ -3921,6 +3921,16 @@ void InputDispatcher::synthesizeCancelationEventsForInputChannelLocked( 


void InputDispatcher::synthesizeCancelationEventsForConnectionLocked(

        const std::shared_ptr<Connection>& connection, const CancelationOptions& options) {

    if ((options.mode == CancelationOptions::Mode::CANCEL_POINTER_EVENTS ||

         options.mode == CancelationOptions::Mode::CANCEL_ALL_EVENTS) &&

        mDragState && mDragState->dragWindow->getToken() == connection->inputChannel->getToken()) {

        LOG(INFO) << __func__

                  << ": Canceling drag and drop because the pointers for the drag window are being "

                     "canceled.";

        sendDropWindowCommandLocked(nullptr, /*x=*/0, /*y=*/0);

        mDragState.reset();

    }



    if (connection->status == Connection::Status::BROKEN) {

        return;

    }

services/inputflinger/tests/InputDispatcher_test.cpp

+134 −16
Original line number Diff line number Diff line
@@ -184,6 +184,18 @@ MATCHER_P2(WithCoords, x, y, "MotionEvent with specified coordinates") { 
    return receivedX == x && receivedY == y;

}



MATCHER_P2(WithRawCoords, x, y, "MotionEvent with specified raw coordinates") {

    if (arg.getPointerCount() != 1) {

        *result_listener << "Expected 1 pointer, got " << arg.getPointerCount();

        return false;

    }

    const float receivedX = arg.getRawX(/*pointerIndex=*/0);

    const float receivedY = arg.getRawY(/*pointerIndex=*/0);

    *result_listener << "expected raw coords (" << x << ", " << y << "), but got (" << receivedX

                     << ", " << receivedY << ")";

    return receivedX == x && receivedY == y;

}



MATCHER_P(WithPointerCount, pointerCount, "MotionEvent with specified number of pointers") {

    *result_listener << "expected pointerCount " << pointerCount << ", but got "

                     << arg.getPointerCount();
@@ -1453,10 +1465,9 @@ std::atomic<int32_t> FakeWindowHandle::sId{1}; 


class FakeMonitorReceiver {

public:

    FakeMonitorReceiver(const std::unique_ptr<InputDispatcher>& dispatcher, const std::string name,

                        int32_t displayId) {

    FakeMonitorReceiver(InputDispatcher& dispatcher, const std::string name, int32_t displayId) {

        base::Result<std::unique_ptr<InputChannel>> channel =

                dispatcher->createInputMonitor(displayId, name, MONITOR_PID);

                dispatcher.createInputMonitor(displayId, name, MONITOR_PID);

        mInputReceiver = std::make_unique<FakeInputReceiver>(std::move(*channel), name);

    }
@@ -4674,7 +4685,7 @@ TEST_F(InputDispatcherDisplayProjectionTest, CancelMotionWithCorrectCoordinates) 
    auto [firstWindow, secondWindow] = setupScaledDisplayScenario();

    // The monitor will always receive events in the logical display's coordinate space, because

    // it does not have a window.

    FakeMonitorReceiver monitor{mDispatcher, "Monitor", ADISPLAY_ID_DEFAULT};

    FakeMonitorReceiver monitor{*mDispatcher, "Monitor", ADISPLAY_ID_DEFAULT};



    // Send down to the first window.

    mDispatcher->notifyMotion(generateMotionArgs(ACTION_DOWN, AINPUT_SOURCE_TOUCHSCREEN,
@@ -4715,6 +4726,43 @@ TEST_F(InputDispatcherDisplayProjectionTest, SynthesizeDownWithCorrectCoordinate 
    secondWindow->consumeMotionEvent(AllOf(WithMotionAction(ACTION_DOWN), WithCoords(-100, -400)));

}



TEST_F(InputDispatcherDisplayProjectionTest, SynthesizeHoverEnterExitWithCorrectCoordinates) {

    auto [firstWindow, secondWindow] = setupScaledDisplayScenario();



    // Send hover move to the second window, and ensure it shows up as hover enter.

    mDispatcher->notifyMotion(generateMotionArgs(ACTION_HOVER_MOVE, AINPUT_SOURCE_STYLUS,

                                                 ADISPLAY_ID_DEFAULT, {PointF{150, 220}}));

    secondWindow->consumeMotionEvent(AllOf(WithMotionAction(ACTION_HOVER_ENTER),

                                           WithCoords(100, 80), WithRawCoords(300, 880)));



    // Touch down at the same location and ensure a hover exit is synthesized.

    mDispatcher->notifyMotion(generateMotionArgs(ACTION_DOWN, AINPUT_SOURCE_STYLUS,

                                                 ADISPLAY_ID_DEFAULT, {PointF{150, 220}}));

    secondWindow->consumeMotionEvent(AllOf(WithMotionAction(ACTION_HOVER_EXIT), WithCoords(100, 80),

                                           WithRawCoords(300, 880)));

    secondWindow->consumeMotionEvent(

            AllOf(WithMotionAction(ACTION_DOWN), WithCoords(100, 80), WithRawCoords(300, 880)));

    secondWindow->assertNoEvents();

    firstWindow->assertNoEvents();

}



TEST_F(InputDispatcherDisplayProjectionTest, SynthesizeHoverCancelationWithCorrectCoordinates) {

    auto [firstWindow, secondWindow] = setupScaledDisplayScenario();



    // Send hover enter to second window

    mDispatcher->notifyMotion(generateMotionArgs(ACTION_HOVER_ENTER, AINPUT_SOURCE_STYLUS,

                                                 ADISPLAY_ID_DEFAULT, {PointF{150, 220}}));

    secondWindow->consumeMotionEvent(AllOf(WithMotionAction(ACTION_HOVER_ENTER),

                                           WithCoords(100, 80), WithRawCoords(300, 880)));



    mDispatcher->cancelCurrentTouch();



    secondWindow->consumeMotionEvent(AllOf(WithMotionAction(ACTION_HOVER_EXIT), WithCoords(100, 80),

                                           WithRawCoords(300, 880)));

    secondWindow->assertNoEvents();

    firstWindow->assertNoEvents();

}



/** Ensure consistent behavior of InputDispatcher in all orientations. */

class InputDispatcherDisplayOrientationFixture

      : public InputDispatcherDisplayProjectionTest,
@@ -5512,7 +5560,7 @@ TEST_F(InputDispatcherMonitorTest, MonitorTouchIsCanceledWhenForegroundWindowDis 
    sp<FakeWindowHandle> window =

            sp<FakeWindowHandle>::make(application, mDispatcher, "Foreground", ADISPLAY_ID_DEFAULT);



    FakeMonitorReceiver monitor = FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitor = FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);



    mDispatcher->onWindowInfosChanged({{*window->getInfo()}, {}, 0, 0});

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,
@@ -5554,7 +5602,7 @@ TEST_F(InputDispatcherMonitorTest, ReceivesMotionEvents) { 
                                                             "Fake Window", ADISPLAY_ID_DEFAULT);

    mDispatcher->onWindowInfosChanged({{*window->getInfo()}, {}, 0, 0});



    FakeMonitorReceiver monitor = FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitor = FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);



    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionDown(*mDispatcher, AINPUT_SOURCE_TOUCHSCREEN, ADISPLAY_ID_DEFAULT))
@@ -5564,7 +5612,7 @@ TEST_F(InputDispatcherMonitorTest, ReceivesMotionEvents) { 
}



TEST_F(InputDispatcherMonitorTest, MonitorCannotPilferPointers) {

    FakeMonitorReceiver monitor = FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitor = FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);



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

    sp<FakeWindowHandle> window = sp<FakeWindowHandle>::make(application, mDispatcher,
@@ -5598,7 +5646,7 @@ TEST_F(InputDispatcherMonitorTest, NoWindowTransform) { 
    window->setWindowOffset(20, 40);

    window->setWindowTransform(0, 1, -1, 0);



    FakeMonitorReceiver monitor = FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitor = FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);



    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionDown(*mDispatcher, AINPUT_SOURCE_TOUCHSCREEN, ADISPLAY_ID_DEFAULT))
@@ -5611,7 +5659,7 @@ TEST_F(InputDispatcherMonitorTest, NoWindowTransform) { 


TEST_F(InputDispatcherMonitorTest, InjectionFailsWithNoWindow) {

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

    FakeMonitorReceiver monitor = FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitor = FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);



    ASSERT_EQ(InputEventInjectionResult::FAILED,

              injectMotionDown(*mDispatcher, AINPUT_SOURCE_TOUCHSCREEN, ADISPLAY_ID_DEFAULT))
@@ -6501,9 +6549,9 @@ TEST_F(InputDispatcherFocusOnTwoDisplaysTest, SetInputWindow_MultiDisplayFocus) 
// Test per-display input monitors for motion event.

TEST_F(InputDispatcherFocusOnTwoDisplaysTest, MonitorMotionEvent_MultiDisplay) {

    FakeMonitorReceiver monitorInPrimary =

            FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

            FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitorInSecondary =

            FakeMonitorReceiver(mDispatcher, "M_2", SECOND_DISPLAY_ID);

            FakeMonitorReceiver(*mDispatcher, "M_2", SECOND_DISPLAY_ID);



    // Test touch down on primary display.

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,
@@ -6546,9 +6594,9 @@ TEST_F(InputDispatcherFocusOnTwoDisplaysTest, MonitorMotionEvent_MultiDisplay) { 
TEST_F(InputDispatcherFocusOnTwoDisplaysTest, MonitorKeyEvent_MultiDisplay) {

    // Input monitor per display.

    FakeMonitorReceiver monitorInPrimary =

            FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

            FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitorInSecondary =

            FakeMonitorReceiver(mDispatcher, "M_2", SECOND_DISPLAY_ID);

            FakeMonitorReceiver(*mDispatcher, "M_2", SECOND_DISPLAY_ID);



    // Test inject a key down.

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED, injectKeyDown(*mDispatcher))
@@ -6584,9 +6632,9 @@ TEST_F(InputDispatcherFocusOnTwoDisplaysTest, CanFocusWindowOnUnfocusedDisplay) 


TEST_F(InputDispatcherFocusOnTwoDisplaysTest, CancelTouch_MultiDisplay) {

    FakeMonitorReceiver monitorInPrimary =

            FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

            FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitorInSecondary =

            FakeMonitorReceiver(mDispatcher, "M_2", SECOND_DISPLAY_ID);

            FakeMonitorReceiver(*mDispatcher, "M_2", SECOND_DISPLAY_ID);



    // Test touch down on primary display.

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,
@@ -7510,7 +7558,7 @@ TEST_F(InputDispatcherSingleWindowAnr, SpyWindowReceivesEventsDuringAppAnrOnMoti 
TEST_F(InputDispatcherSingleWindowAnr, UnresponsiveMonitorAnr) {

    mDispatcher->setMonitorDispatchingTimeoutForTest(SPY_TIMEOUT);



    FakeMonitorReceiver monitor = FakeMonitorReceiver(mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);

    FakeMonitorReceiver monitor = FakeMonitorReceiver(*mDispatcher, "M_1", ADISPLAY_ID_DEFAULT);



    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionDown(*mDispatcher, AINPUT_SOURCE_TOUCHSCREEN, ADISPLAY_ID_DEFAULT,
@@ -9367,6 +9415,76 @@ TEST_F(InputDispatcherDragTests, MouseDragAndDrop) { 
    mSecondWindow->assertNoEvents();

}



/**

 * Start drag and drop with a pointer whose id is not 0, cancel the current touch, and ensure drag

 * and drop is also canceled. Then inject a simple gesture, and ensure dispatcher does not crash.

 */

TEST_F(InputDispatcherDragTests, DragAndDropFinishedWhenCancelCurrentTouch) {

    // Down on second window

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionDown(*mDispatcher, AINPUT_SOURCE_TOUCHSCREEN, ADISPLAY_ID_DEFAULT,

                               {150, 50}))

            << "Inject motion event should return InputEventInjectionResult::SUCCEEDED";



    ASSERT_NO_FATAL_FAILURE(mSecondWindow->consumeMotionDown());

    ASSERT_NO_FATAL_FAILURE(mSpyWindow->consumeMotionDown());



    // Down on first window

    const MotionEvent secondFingerDownEvent =

            MotionEventBuilder(POINTER_1_DOWN, AINPUT_SOURCE_TOUCHSCREEN)

                    .displayId(ADISPLAY_ID_DEFAULT)

                    .pointer(PointerBuilder(/*id=*/0, ToolType::FINGER).x(150).y(50))

                    .pointer(PointerBuilder(/*id=*/1, ToolType::FINGER).x(50).y(50))

                    .build();

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionEvent(*mDispatcher, secondFingerDownEvent, INJECT_EVENT_TIMEOUT,

                                InputEventInjectionSync::WAIT_FOR_RESULT))

            << "Inject motion event should return InputEventInjectionResult::SUCCEEDED";

    ASSERT_NO_FATAL_FAILURE(mWindow->consumeMotionDown());

    ASSERT_NO_FATAL_FAILURE(mSecondWindow->consumeMotionMove());

    ASSERT_NO_FATAL_FAILURE(mSpyWindow->consumeMotionPointerDown(1));



    // Start drag on first window

    ASSERT_TRUE(startDrag(/*sendDown=*/false, AINPUT_SOURCE_TOUCHSCREEN));



    // Trigger cancel

    mDispatcher->cancelCurrentTouch();

    ASSERT_NO_FATAL_FAILURE(mSecondWindow->consumeMotionCancel());

    ASSERT_NO_FATAL_FAILURE(mDragWindow->consumeMotionCancel());

    ASSERT_NO_FATAL_FAILURE(mSpyWindow->consumeMotionCancel());



    ASSERT_TRUE(mDispatcher->waitForIdle());

    // The D&D finished with nullptr

    mFakePolicy->assertDropTargetEquals(*mDispatcher, nullptr);



    // Remove drag window

    mDispatcher->onWindowInfosChanged({{*mWindow->getInfo(), *mSecondWindow->getInfo()}, {}, 0, 0});



    // Inject a simple gesture, ensure dispatcher not crashed

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionDown(*mDispatcher, AINPUT_SOURCE_TOUCHSCREEN, ADISPLAY_ID_DEFAULT,

                               PointF{50, 50}))

            << "Inject motion event should return InputEventInjectionResult::SUCCEEDED";

    ASSERT_NO_FATAL_FAILURE(mWindow->consumeMotionDown());



    const MotionEvent moveEvent =

            MotionEventBuilder(AMOTION_EVENT_ACTION_MOVE, AINPUT_SOURCE_TOUCHSCREEN)

                    .displayId(ADISPLAY_ID_DEFAULT)

                    .pointer(PointerBuilder(/*id=*/0, ToolType::FINGER).x(50).y(50))

                    .build();

    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionEvent(*mDispatcher, moveEvent, INJECT_EVENT_TIMEOUT,

                                InputEventInjectionSync::WAIT_FOR_RESULT))

            << "Inject motion event should return InputEventInjectionResult::SUCCEEDED";

    ASSERT_NO_FATAL_FAILURE(mWindow->consumeMotionMove());



    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,

              injectMotionUp(*mDispatcher, AINPUT_SOURCE_TOUCHSCREEN, ADISPLAY_ID_DEFAULT,

                             {50, 50}))

            << "Inject motion event should return InputEventInjectionResult::SUCCEEDED";

    ASSERT_NO_FATAL_FAILURE(mWindow->consumeMotionUp());

}



class InputDispatcherDropInputFeatureTest : public InputDispatcherTest {};



TEST_F(InputDispatcherDropInputFeatureTest, WindowDropsInput) {