mirror of
https://github.com/LawnchairLauncher/lawnchair.git
synced 2026-02-27 23:36:47 +00:00
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
This commit is contained in:
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -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");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user