From 7a1beb559f9cc668d2c2efca05f3ce952c13a26e Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Wed, 8 Nov 2023 13:20:57 -0800 Subject: [PATCH] Allowing ACTION_CANCEL events to come from device 0 Tests assert that input events come to Launcher only from tests, which sets deviceId to 0. This way, we spot when a cable touches a lab device and breaks the tests, in which case deviceId will be != -1. But CANCEL event, which is programmatic, now can legitimately come from device 0. Bug: 308489875 Test: presubmit Flag: N/A Change-Id: I84ee9ed8e008043f83e82d57b17b64a10677ee8d --- src/com/android/launcher3/testing/TestLogging.java | 2 +- .../src/com/android/launcher3/util/rule/FailureWatcher.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/testing/TestLogging.java b/src/com/android/launcher3/testing/TestLogging.java index 70691f82de..60d0e95c90 100644 --- a/src/com/android/launcher3/testing/TestLogging.java +++ b/src/com/android/launcher3/testing/TestLogging.java @@ -76,7 +76,7 @@ public final class TestLogging { // be more useful. // That's why we pass false as the value for the 'reportToTapl' parameter. recordEventSlow(sequence, message + ": " + event, false); - registerEventNotFromTest(event); + if (action != MotionEvent.ACTION_CANCEL) registerEventNotFromTest(event); } } diff --git a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java index 62d70ad1cd..10b428a111 100644 --- a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java +++ b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java @@ -59,8 +59,9 @@ public class FailureWatcher extends TestWatcher { throw new AssertionError( "Launcher received events not sent by the test. This may mean " + "that the touch screen of the lab device has sent false" - + " events. See the logcat for TaplEvents tag and look " - + "for events with deviceId != -1"); + + " events. See the logcat for " + + "TaplEvents|LauncherEvents|TaplTarget tag and look for " + + "events with deviceId != -1"); } } }