Index: build/android/pylib/perf/test_runner.py |
diff --git a/build/android/pylib/perf/test_runner.py b/build/android/pylib/perf/test_runner.py |
index fec7537f06c31e53d92c50e9a4bb1c4f9c501bda..edc813675a6b699e440fc47ed17345b2fa957893 100644 |
--- a/build/android/pylib/perf/test_runner.py |
+++ b/build/android/pylib/perf/test_runner.py |
@@ -50,6 +50,7 @@ import pickle |
import os |
import sys |
+from pylib import android_commands |
from pylib import constants |
from pylib.base import base_test_result |
from pylib.base import base_test_runner |
@@ -153,6 +154,11 @@ class TestRunner(base_test_runner.BaseTestRunner): |
} |
self._SaveResult(persisted_result) |
+ try: |
+ self.adb.KillAdbdDevice() |
+ except Exception as e: |
+ logging.error('Exception when killing adbd %s', e) |
+ |
return (output, result_type) |
def RunTest(self, test_name): |