Relands Android perf tests: kill adbd on the device after running a test.

build/android/pylib/perf/test_runner.py

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 e3648f74aafd1d9d5c2f9f415c5512030ecb1cd1..6f4a8bd5c07f91fccda3644311106e3e00468be4 100644
--- a/build/android/pylib/perf/test_runner.py
+++ b/build/android/pylib/perf/test_runner.py
@@ -46,8 +46,11 @@ import logging
 import os
 import pickle
 import sys
+import time
 
+from pylib import android_commands
 from pylib import constants
+from pylib import forwarder
 from pylib import pexpect
 from pylib.base import base_test_result
 from pylib.base import base_test_runner
@@ -121,6 +124,14 @@ class TestRunner(base_test_runner.BaseTestRunner):
     Returns:
       A tuple containing (Output, base_test_result.ResultType)
     """
+    try:
+      logging.warning('Unmapping device ports')
+      forwarder.Forwarder.UnmapAllDevicePorts(self.adb)
+      time.sleep(5)

[rmcilroy, 2013/10/21 11:33:13]

Is this necesary now we have --wait-for-device? I'd prefer we didn't have to add
another 5 second per test delay to the bots if possible.

[bulach, 2013/10/21 15:30:13]

Done.

+      self.adb.KillAdbdDevice()
+    except Exception as e:
+      logging.error('Exception when tearing down device %s', e)
+
     cmd = ('%s --device %s' %
            (self._tests[test_name], self.device))
     logging.info('%s : %s', test_name, cmd)