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

Commit 8731ebd2 authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Android (Google) Code Review
Browse files

Merge "Fix flakiness for ExternalStylusConnectedDuringTouchGesture" into main

parents 42ef07c8 004f311e

services/inputflinger/tests/InputReader_test.cpp

+0 −6
Original line number Diff line number Diff line
@@ -1830,9 +1830,6 @@ TEST_F(TouchIntegrationTest, NotifiesPolicyWhenStylusGestureStarted) { 
}















TEST_F(TouchIntegrationTest, ExternalStylusConnectedDuringTouchGesture) {













    ASSERT_NO_FATAL_FAILURE(













            mTestListener->assertNotifyDeviceResetWasCalled(WithDeviceId(mDeviceInfo.getId())));













    ASSERT_NO_FATAL_FAILURE(mTestListener->assertNotifyDeviceResetWasNotCalled());















    const Point centerPoint = mDevice->getCenterPoint();





























    // Down









@@ -1855,9 +1852,6 @@ TEST_F(TouchIntegrationTest, ExternalStylusConnectedDuringTouchGesture) {













    ASSERT_NO_FATAL_FAILURE(mTestListener->assertNotifyConfigurationChangedWasCalled());















    const auto stylusInfo = findDeviceByName(externalStylus->getName());















    ASSERT_TRUE(stylusInfo);













    ASSERT_NO_FATAL_FAILURE(













            mTestListener->assertNotifyDeviceResetWasCalled(WithDeviceId(stylusInfo->getId())));













    ASSERT_NO_FATAL_FAILURE(mTestListener->assertNotifyDeviceResetWasNotCalled());





























    // Move















    mDevice->sendMove(centerPoint + Point(2, 2));