summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2023-06-26 19:33:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-26 19:33:35 +0000
commit7e639753e20f8528d9f86755f4cb65cc02f2f1ce (patch)
treeec546e8e8f5e7b690399ed19e546195eb4ebfb5a
parent4d9cef90b63391b797b70e7054600ddd205460ee (diff)
parenta82711a15c1066b19390e33424c39e2cbccbea07 (diff)
Merge "Use threadsafe death testing for dispatcher tests" into udc-qpr-dev am: 0b8abab2ab am: a82711a15c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/23785088 Change-Id: Iab6a155b7577187bf7b6c17b438ebe738841be7d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--services/inputflinger/tests/InputDispatcher_test.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/inputflinger/tests/InputDispatcher_test.cpp b/services/inputflinger/tests/InputDispatcher_test.cpp
index 841769bab1..f408204bad 100644
--- a/services/inputflinger/tests/InputDispatcher_test.cpp
+++ b/services/inputflinger/tests/InputDispatcher_test.cpp
@@ -9577,6 +9577,7 @@ public:
using InputDispatcherStylusInterceptorDeathTest = InputDispatcherStylusInterceptorTest;
TEST_F(InputDispatcherStylusInterceptorDeathTest, UntrustedOverlay_AbortsDispatcher) {
+ testing::GTEST_FLAG(death_test_style) = "threadsafe";
ScopedSilentDeath _silentDeath;
auto [overlay, window] = setupStylusOverlayScenario();