commit 7fda6aeffbe79189cef0ced92e05d6bb4d89df3b
author Harry Zhang <harrytczhang@google.com> Wed May 08 14:00:26 2019 -0700
committer Harry Zhang <harrytczhang@google.com> Wed May 08 14:00:26 2019 -0700
tree 51bfb54f4219c6164299bc1c619fc1e4350126bb
parent 5d954cd6521a90c0dd5b939119e99dd7fe182fad

Device collector: change on-failure collection to fire after test has failed.

Bug: 132278153
Test: atest CollectorDeviceLibTest (unchanged and still pass)
Change-Id: I716dd16adc4cf76f7c403dece30f66f0f0439a39

libraries/device-collectors/src/main/java/android/device/collectors/BaseMetricListener.java

diff --git a/libraries/device-collectors/src/main/java/android/device/collectors/BaseMetricListener.java b/libraries/device-collectors/src/main/java/android/device/collectors/BaseMetricListener.java
index fbf01d1..deefa7c 100644
--- a/libraries/device-collectors/src/main/java/android/device/collectors/BaseMetricListener.java
+++ b/libraries/device-collectors/src/main/java/android/device/collectors/BaseMetricListener.java
@@ -142,6 +142,7 @@
 
     @Override
     public final void testFailure(Failure failure) throws Exception {
+        super.testFailure(failure);
         Description description = failure.getDescription();
         if (shouldRun(description)) {
             try {
@@ -151,7 +152,6 @@
                 Log.e(getTag(), "Exception during onTestFail.", e);
             }
         }
-        super.testFailure(failure);
     }
 
     @Override