summaryrefslogtreecommitdiff
path: root/tests/testables
diff options
context:
space:
mode:
authorHyunyoung Song <hyunyoungs@google.com>2019-08-30 14:47:43 -0700
committerHyunyoung Song <hyunyoungs@google.com>2019-09-01 00:31:47 -0700
commit8f9d34cb5f38889b233191495434d4c3bd4f7cfc (patch)
treed383f4fefaa3db9c334931df3226b854d2cb0974 /tests/testables
parent09809a3d7b00de3fa063653a62d73b6246e00353 (diff)
[DO NOT MERGE] qt-qpr1-sysui-dev @ build 5814791
Test: presubmit setup on source branch Bug: 130289146 Create a Gradle build for SystemUI Bug: 136279712 Daggerize FalsingManager Bug: 137324767 "Unable to instantiate service com.android.systemui.doze.DozeService" exception breaks launcher tests Bug: 137563419 Remove Bouncer reveal delay from bypass flow Bug: 138787339 Allow Services and Activities to be injected into directly. Bug: 139128921 [AS 3.5 RC2, SDK API 29 rev 2] Overload resolution ambiguity: while removing element from HashMap Bug: 64712476 Import translations for dev branches Change-Id: Ib7fd4706c070907fd556c3532957f3b1b046de6d
Diffstat (limited to 'tests/testables')
-rw-r--r--tests/testables/src/android/testing/DexmakerShareClassLoaderRule.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/testables/src/android/testing/DexmakerShareClassLoaderRule.java b/tests/testables/src/android/testing/DexmakerShareClassLoaderRule.java
index 1b8e58c3050d..7057a90c7672 100644
--- a/tests/testables/src/android/testing/DexmakerShareClassLoaderRule.java
+++ b/tests/testables/src/android/testing/DexmakerShareClassLoaderRule.java
@@ -20,6 +20,8 @@ import android.util.Log;
import com.android.internal.annotations.VisibleForTesting;
+import libcore.util.SneakyThrow;
+
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
@@ -55,7 +57,11 @@ public class DexmakerShareClassLoaderRule implements TestRule {
* WARNING: This is absolutely incompatible with running tests in parallel!
*/
public static void runWithDexmakerShareClassLoader(Runnable r) {
- apply(r::run).run();
+ try {
+ apply(r::run).run();
+ } catch (Throwable t) {
+ SneakyThrow.sneakyThrow(t);
+ }
}
/**