Disable main looper holding
It might make failures more clear
Test: runtest systemui
Bug: 110417074
Change-Id: I9880998af42016b9d625cc3e890a94b282f49df0
diff --git a/tests/testables/src/android/testing/TestableInstrumentation.java b/tests/testables/src/android/testing/TestableInstrumentation.java
index 3207b48..c35dc68 100644
--- a/tests/testables/src/android/testing/TestableInstrumentation.java
+++ b/tests/testables/src/android/testing/TestableInstrumentation.java
@@ -38,22 +38,26 @@
@Override
public void onCreate(Bundle arguments) {
- sManager = new MainLooperManager();
- Log.setWtfHandler((tag, what, system) -> {
- if (system) {
- Log.e(TAG, "WTF!!", what);
- } else {
- // These normally kill the app, but we don't want that in a test, instead we want
- // it to throw.
- throw new RuntimeException(what);
- }
- });
+ if (TestableLooper.HOLD_MAIN_THREAD) {
+ sManager = new MainLooperManager();
+ Log.setWtfHandler((tag, what, system) -> {
+ if (system) {
+ Log.e(TAG, "WTF!!", what);
+ } else {
+ // These normally kill the app, but we don't want that in a test, instead we want
+ // it to throw.
+ throw new RuntimeException(what);
+ }
+ });
+ }
super.onCreate(arguments);
}
@Override
public void finish(int resultCode, Bundle results) {
- sManager.destroy();
+ if (TestableLooper.HOLD_MAIN_THREAD) {
+ sManager.destroy();
+ }
super.finish(resultCode, results);
}