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

Commit 110ba32d authored by Vaibhav Devmurari's avatar Vaibhav Devmurari
Browse files

Fix broken Drag and Drop 

Unable to Drag outside of the current activity usind gesture nav,
caused due to aosp/2658296
Bug: 311606094
Test: atest inputflinger_tests

Change-Id: I1ed01c1b8791a3fe9f1371dba8a4e6cc9e3fa983
parent d1a34bff

services/inputflinger/dispatcher/InputDispatcher.cpp

+9 −10
Original line number Diff line number Diff line
@@ -3981,16 +3981,6 @@ 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;

    }
@@ -4003,6 +3993,7 @@ void InputDispatcher::synthesizeCancelationEventsForConnectionLocked( 
    if (cancelationEvents.empty()) {

        return;

    }



    if (DEBUG_OUTBOUND_EVENT_DETAILS) {

        ALOGD("channel '%s' ~ Synthesized %zu cancelation events to bring channel back in sync "

              "with reality: %s, mode=%s.",
@@ -4051,6 +4042,14 @@ void InputDispatcher::synthesizeCancelationEventsForConnectionLocked( 
                         pointerIndex++) {

                        pointerIds.set(motionEntry.pointerProperties[pointerIndex].id);

                    }

                    if (mDragState && mDragState->dragWindow->getToken() == token &&

                        pointerIds.test(mDragState->pointerId)) {

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

                    }

                    addPointerWindowTargetLocked(window, InputTarget::Flags::DISPATCH_AS_IS,

                                                 pointerIds, motionEntry.downTime, targets);

                } else {

services/inputflinger/tests/InputDispatcher_test.cpp

+44 −0
Original line number Diff line number Diff line
@@ -9656,6 +9656,50 @@ TEST_F(InputDispatcherDragTests, DragAndDrop) { 
    mSecondWindow->assertNoEvents();

}













TEST_F(InputDispatcherDragTests, DragAndDropNotCancelledIfSomeOtherPointerIsPilfered) {













    startDrag();

























    // No cancel event after drag start













    mSpyWindow->assertNoEvents();

























    const MotionEvent secondFingerDownEvent =













            MotionEventBuilder(POINTER_1_DOWN, AINPUT_SOURCE_TOUCHSCREEN)













                    .eventTime(systemTime(SYSTEM_TIME_MONOTONIC))













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













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













                    .build();













    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,













              injectMotionEvent(*mDispatcher, secondFingerDownEvent, INJECT_EVENT_TIMEOUT,













                                InputEventInjectionSync::WAIT_FOR_RESULT))













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

























    // Receives cancel for first pointer after next pointer down













    mSpyWindow->consumeMotionEvent(WithMotionAction(ACTION_CANCEL));













    mSpyWindow->consumeMotionEvent(WithMotionAction(ACTION_DOWN));













    mDragWindow->consumeMotionEvent(WithMotionAction(ACTION_MOVE));

























    mSpyWindow->assertNoEvents();

























    // Spy window calls pilfer pointers













    EXPECT_EQ(OK, mDispatcher->pilferPointers(mSpyWindow->getToken()));













    mDragWindow->assertNoEvents();

























    const MotionEvent firstFingerMoveEvent =













            MotionEventBuilder(POINTER_1_DOWN, AINPUT_SOURCE_TOUCHSCREEN)













                    .eventTime(systemTime(SYSTEM_TIME_MONOTONIC))













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













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













                    .build();













    ASSERT_EQ(InputEventInjectionResult::SUCCEEDED,













              injectMotionEvent(*mDispatcher, secondFingerDownEvent, INJECT_EVENT_TIMEOUT,













                                InputEventInjectionSync::WAIT_FOR_RESULT))













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

























    // Drag window should still receive the new event













    mDragWindow->consumeMotionEvent(WithMotionAction(ACTION_MOVE));













    mDragWindow->assertNoEvents();













}



























TEST_F(InputDispatcherDragTests, StylusDragAndDrop) {















    startDrag(true, AINPUT_SOURCE_STYLUS);