Stop collection thread in finally, not on destroy.oreo-mr1-dev

Bug: 37091954
Test: manual
Change-Id: I49c6a63fccf3f03c7c2bf77fd1e5d379541da7ba

1 files changed, 5 insertions, 6 deletions

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 2603abb4f..1cf66cd99 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 @@ public class AuptTestRunner extends InstrumentationTestRunner {
                     injectInstrumentation(test);
                 }
 
-                super.runTest(result);
+                try {
+                    super.runTest(result);
+                } finally {
+                    mDataCollector.stop();
+                }
             }
         };
 
@@ -228,11 +232,6 @@ public class AuptTestRunner extends InstrumentationTestRunner {
         super.onCreate(params);
     }
 
-    @Override
-    public void onDestroy() {
-        mDataCollector.stop();
-    }
-
     /* Option-parsing helpers */
 
     private long parseLongParam(String key, long alternative) throws NumberFormatException {