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

Commit e74b35ff authored by lilinnan's avatar lilinnan Committed by Prabir Pradhan
Browse files

Fix spot not disappear when display id changed 



Turn on show touches in settings, and finger press on screen, let the
spot show, at now, display id changed, the spot will stay on screen.

when display id changed, we should cancel touch event and update
spot state.

Bug: 239378650
Bug: 234662773
Test: atest inputflinger_tests

Signed-off-by: default avatarlilinnan <lilinnan@xiaomi.corp-partner.google.com>
Change-Id: Ic289d772087e53716b4d63c431d9f41af721150e
Merged-In: Ic289d772087e53716b4d63c431d9f41af721150e
(cherry picked from commit 687e58faa44d7f5b4a5f21ca59442252716839ea)
parent 2c23a2ee

services/inputflinger/reader/mapper/TouchInputMapper.cpp

+12 −2
Original line number Diff line number Diff line
@@ -390,6 +390,10 @@ void TouchInputMapper::configure(nsecs_t when, const InputReaderConfiguration* c 
    }



    if (changes && resetNeeded) {

        // If device was reset, cancel touch event and update touch spot state.

        cancelTouch(mCurrentRawState.when, mCurrentRawState.readTime);

        mCurrentCookedState.clear();

        updateTouchSpots();

        // Send reset, unless this is the first time the device has been configured,

        // in which case the reader will call reset itself after all mappers are ready.

        NotifyDeviceResetArgs args(getContext()->getNextId(), when, getDeviceId());
@@ -941,6 +945,7 @@ void TouchInputMapper::configureInputDevice(nsecs_t when, bool* outResetNeeded) 
    bool skipViewportUpdate = false;

    if (viewportChanged) {

        const bool viewportOrientationChanged = mViewport.orientation != newViewport->orientation;

        const bool viewportDisplayIdChanged = mViewport.displayId != newViewport->displayId;

        mViewport = *newViewport;



        if (mDeviceMode == DeviceMode::DIRECT || mDeviceMode == DeviceMode::POINTER) {
@@ -1016,8 +1021,9 @@ void TouchInputMapper::configureInputDevice(nsecs_t when, bool* outResetNeeded) 
                    : getInverseRotation(mViewport.orientation);

            // For orientation-aware devices that work in the un-rotated coordinate space, the

            // viewport update should be skipped if it is only a change in the orientation.

            skipViewportUpdate = mParameters.orientationAware && mDisplayWidth == oldDisplayWidth &&

                    mDisplayHeight == oldDisplayHeight && viewportOrientationChanged;

            skipViewportUpdate = !viewportDisplayIdChanged && mParameters.orientationAware &&

                    mDisplayWidth == oldDisplayWidth && mDisplayHeight == oldDisplayHeight &&

                    viewportOrientationChanged;



            // Apply the input device orientation for the device.

            mInputDeviceOrientation =
@@ -1926,6 +1932,10 @@ void TouchInputMapper::dispatchVirtualKey(nsecs_t when, nsecs_t readTime, uint32 
}



void TouchInputMapper::abortTouches(nsecs_t when, nsecs_t readTime, uint32_t policyFlags) {

    if (mCurrentMotionAborted) {

        // Current motion event was already aborted.

        return;

    }

    BitSet32 currentIdBits = mCurrentCookedState.cookedPointerData.touchingIdBits;

    if (!currentIdBits.isEmpty()) {

        int32_t metaState = getContext()->getGlobalMetaState();

services/inputflinger/tests/InputReader_test.cpp

+32 −0
Original line number Diff line number Diff line
@@ -6690,6 +6690,34 @@ TEST_F(SingleTouchInputMapperTest, Process_WhenAbsPressureIsPresent_HoversIfItsV 
            toDisplayX(150), toDisplayY(250), 0, 0, 0, 0, 0, 0, 0, 0));

}



TEST_F(SingleTouchInputMapperTest,

       Process_WhenViewportDisplayIdChanged_TouchIsCanceledAndDeviceIsReset) {

    addConfigurationProperty("touch.deviceType", "touchScreen");

    prepareDisplay(DISPLAY_ORIENTATION_0);

    prepareButtons();

    prepareAxes(POSITION);

    SingleTouchInputMapper& mapper = addMapperAndConfigure<SingleTouchInputMapper>();

    NotifyMotionArgs motionArgs;



    // Down.

    processDown(mapper, 100, 200);

    processSync(mapper);



    // We should receive a down event

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&motionArgs));

    ASSERT_EQ(AMOTION_EVENT_ACTION_DOWN, motionArgs.action);



    // Change display id

    clearViewports();

    prepareSecondaryDisplay(ViewportType::INTERNAL);



    // We should receive a cancel event

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&motionArgs));

    ASSERT_EQ(AMOTION_EVENT_ACTION_CANCEL, motionArgs.action);

    // Then receive reset called

    ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyDeviceResetWasCalled());

}



// --- TouchDisplayProjectionTest ---



class TouchDisplayProjectionTest : public SingleTouchInputMapperTest {
@@ -8725,6 +8753,10 @@ TEST_F(MultiTouchInputMapperTest, VideoFrames_WhenNotOrientationAware_AreRotated 
        // window's coordinate space.

        frames[0].rotate(getInverseRotation(orientation));

        ASSERT_EQ(frames, motionArgs.videoFrames);



        // Release finger.

        processSync(mapper);

        ASSERT_NO_FATAL_FAILURE(mFakeListener->assertNotifyMotionWasCalled(&motionArgs));

    }

}