commit 0cce835cf7dcd33544a31b3f062ddd17d8ec185c
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 13 04:58:02 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 13 04:58:02 2021 +0000
tree 0fb5274c226fa70aea3f75b0b80454e76d84963d
parent 39a93b1d8d26deb87989ed6164cd403026b3a005
parent 73ad3abc29eee65e587841009db3932fde8f3b3c

Merge "Restoring generating artifacts" into sc-v2-dev am: 73ad3abc29

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15547434

Change-Id: Ia9b596701d4d46782c825ff3a37e4da26e91ee81

tests/src/com/android/launcher3/util/rule/FailureWatcher.java

diff --git a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
index 60529a4..0b60ffc 100644
--- a/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
+++ b/tests/src/com/android/launcher3/util/rule/FailureWatcher.java
@@ -44,7 +44,7 @@
             @Override
             public void evaluate() throws Throwable {
                 try {
-                    base.evaluate();
+                    FailureWatcher.super.apply(base, description).evaluate();
                 } finally {
                     if (mLauncher.hadNontestEvents()) {
                         throw new AssertionError(