commit 291d3c4b98ad062f13c89da098d8af890a7717f2
author David Saff <saff@google.com> Thu Oct 06 22:19:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 06 22:19:02 2022 +0000
tree c07bc90721e3b8424623283f8b5507b0e12d55dc
parent 80e47c6ac52ad6cea48e2057c4586ab4b16e39d6
parent c92260f21c9e68c69d53be683093104af0f29699

Merge "Use SysuiTestCase#runShellCommand." into tm-qpr-dev am: c92260f21c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20072234

Change-Id: Ie39b058a74718309ec6bb4b4b8082fc0f2ff4629
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsImeTest.java

diff --git a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsImeTest.java b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsImeTest.java
index d418836..7f55d38 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsImeTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsImeTest.java
@@ -49,6 +49,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BooleanSupplier;
 
@@ -148,8 +149,12 @@
         return false;
     }
 
-    private static void executeShellCommand(String cmd) {
-        InstrumentationRegistry.getInstrumentation().getUiAutomation().executeShellCommand(cmd);
+    private void executeShellCommand(String cmd) {
+        try {
+            runShellCommand(cmd);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     /**