commit 8731ebd2d633fed178bb1ed7bf0186a9770dc2ee
author Prabir Pradhan <prabirmsp@google.com> Fri Aug 11 16:17:20 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 11 16:17:20 2023 +0000
tree 10ed68e6bfb8e2fdd05032be2fed9347760a4596
parent 42ef07c84298d5e4f2d59e4c8dde674d6f59dec4
parent 004f311e46238eca8ae198e69d03aec3324c9171

Merge "Fix flakiness for ExternalStylusConnectedDuringTouchGesture" into main

services/inputflinger/tests/InputReader_test.cpp

diff --git a/services/inputflinger/tests/InputReader_test.cpp b/services/inputflinger/tests/InputReader_test.cpp
index 1514096..02c2f65 100644
--- a/services/inputflinger/tests/InputReader_test.cpp
+++ b/services/inputflinger/tests/InputReader_test.cpp
@@ -1830,9 +1830,6 @@
 }
 
 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 @@
     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));