summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Prabir Pradhan <prabirmsp@google.com> 2024-02-05 23:02:01 +0000
committer Prabir Pradhan <prabirmsp@google.com> 2024-02-06 22:54:00 +0000
commita2d3cf16815babdcdd528a0c6733b0b0c121323c (patch)
treea8951a37ce8c9fa019d4a272c9e7445f0f932403
parent0eaf1408fb8d0d4b467a9501617481aa78a65026 (diff)
Reland "Increase the test timeout used when waiting for events to be traced"
This reverts commit aff0a04702df8f66dddf022cbefdec24ac7138a5. Reason for revert: b/323347575, b/210460522 Change-Id: I8f0b2a246dd25f6449e311411cd4d1b698706e88
-rw-r--r--services/inputflinger/tests/FakeInputTracingBackend.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/services/inputflinger/tests/FakeInputTracingBackend.cpp b/services/inputflinger/tests/FakeInputTracingBackend.cpp
index 77d35fbd1d..1d2710749b 100644
--- a/services/inputflinger/tests/FakeInputTracingBackend.cpp
+++ b/services/inputflinger/tests/FakeInputTracingBackend.cpp
@@ -23,7 +23,11 @@ namespace android::inputdispatcher {
namespace {
-constexpr auto TRACE_TIMEOUT = std::chrono::milliseconds(100);
+// Use a larger timeout while waiting for events to be traced, compared to the timeout used while
+// waiting to receive events through the input channel. Events are traced from a separate thread,
+// which does not have the same high thread priority as the InputDispatcher's thread, so the tracer
+// is expected to lag behind the Dispatcher at times.
+constexpr auto TRACE_TIMEOUT = std::chrono::seconds(5);
base::ResultError<> error(const std::ostringstream& ss) {
return base::ResultError(ss.str(), BAD_VALUE);