commit f1744af64eb2460238b68009ce24aa9d63f43c61
author android-build-team Robot <android-build-team-robot@google.com> Fri Oct 06 07:20:40 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Fri Oct 06 07:20:40 2017 +0000
tree 07f9f8552c239f305bb68b9861dde51757fb334e
parent 2384254570fdd0b156b7022056ba674fecb3fef7
parent d9bf8268761d426fcb7a43590c4fdada2608e1f3

Snap for 4380782 from d9bf8268761d426fcb7a43590c4fdada2608e1f3 to oc-mr1-release

Change-Id: Ic7bac8cd9bc9124ce78439abb217cd897d49eb11

libraries/aupt-lib/src/android/support/test/aupt/AuptTestRunner.java

diff --git a/libraries/aupt-lib/src/android/support/test/aupt/AuptTestRunner.java b/libraries/aupt-lib/src/android/support/test/aupt/AuptTestRunner.java
index 2603abb..1cf66cd 100644
--- a/libraries/aupt-lib/src/android/support/test/aupt/AuptTestRunner.java
+++ b/libraries/aupt-lib/src/android/support/test/aupt/AuptTestRunner.java
@@ -204,7 +204,11 @@
                     injectInstrumentation(test);
                 }
 
-                super.runTest(result);
+                try {
+                    super.runTest(result);
+                } finally {
+                    mDataCollector.stop();
+                }
             }
         };
 
@@ -228,11 +232,6 @@
         super.onCreate(params);
     }
 
-    @Override
-    public void onDestroy() {
-        mDataCollector.stop();
-    }
-
     /* Option-parsing helpers */
 
     private long parseLongParam(String key, long alternative) throws NumberFormatException {