diff options
author | Michael Rosenfeld <mrosenfeld@google.com> | 2017-10-05 14:44:47 -0700 |
---|---|---|
committer | Michael Rosenfeld <mrosenfeld@google.com> | 2017-10-05 21:47:28 +0000 |
commit | d9bf8268761d426fcb7a43590c4fdada2608e1f3 (patch) | |
tree | 07f9f8552c239f305bb68b9861dde51757fb334e | |
parent | 834e3c2991d6f4151c06252cf168afa61b70f641 (diff) | |
download | platform_testing-d9bf8268761d426fcb7a43590c4fdada2608e1f3.tar.gz |
Stop collection thread in finally, not on destroy.oreo-mr1-dev
Bug: 37091954
Test: manual
Change-Id: I49c6a63fccf3f03c7c2bf77fd1e5d379541da7ba
-rw-r--r-- | libraries/aupt-lib/src/android/support/test/aupt/AuptTestRunner.java | 11 |
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 { |