summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vaibhav Devmurari <vdevmurari@google.com> 2023-09-18 13:01:22 +0000
committer Vaibhav Devmurari <vdevmurari@google.com> 2023-09-18 13:01:22 +0000
commit6d76ddf772bb5021113d1ca1f209f913fef3ebbc (patch)
treea1e09e0f6376c2cfd0daa7099aadcf4660135a67
parent05605b2518f17a4f6d655bfffbe60883fb3e88e4 (diff)
Fix broken ShortcutLoggingTests because of injectinputEvent
Test: atest ShortcutLoggingTests Bug: 299015222 Change-Id: I396260ab185f33a271ecb4397c69937d771d1acd
-rw-r--r--services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java1
-rw-r--r--services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java4
2 files changed, 5 insertions, 0 deletions
diff --git a/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java b/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java
index 479194673e80..0a7bb00ce1c2 100644
--- a/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java
+++ b/services/tests/wmtests/src/com/android/server/policy/ShortcutLoggingTests.java
@@ -297,6 +297,7 @@ public class ShortcutLoggingTests extends ShortcutKeyTestBase {
mPhoneWindowManager.overrideUserSetupComplete();
mPhoneWindowManager.setupAssistForLaunch();
mPhoneWindowManager.overrideTogglePanel();
+ mPhoneWindowManager.overrideInjectKeyEvent();
}
@Test
diff --git a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java
index e301da7c58fc..6d46d9ccf02e 100644
--- a/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java
+++ b/services/tests/wmtests/src/com/android/server/policy/TestPhoneWindowManager.java
@@ -464,6 +464,10 @@ class TestPhoneWindowManager {
doReturn(device).when(mInputManager).getInputDevice(anyInt());
}
+ void overrideInjectKeyEvent() {
+ doReturn(true).when(mInputManager).injectInputEvent(any(KeyEvent.class), anyInt());
+ }
+
void overrideSearchKeyBehavior(int behavior) {
mPhoneWindowManager.mSearchKeyBehavior = behavior;
}