| Index: build/android/pylib/local/device/local_device_perf_test_run.py
|
| diff --git a/build/android/pylib/local/device/local_device_perf_test_run.py b/build/android/pylib/local/device/local_device_perf_test_run.py
|
| index 0dbafd5a104f60f033eacca23a33a2f343f79102..b34c3603891edf6af51085fa320c6a10b1491dfa 100644
|
| --- a/build/android/pylib/local/device/local_device_perf_test_run.py
|
| +++ b/build/android/pylib/local/device/local_device_perf_test_run.py
|
| @@ -252,12 +252,7 @@
|
| self._TestTearDown()
|
| if result_type != base_test_result.ResultType.PASS:
|
| try:
|
| - # TODO(rnephew): Possible problem when restarting on N7 devices.
|
| - # Determine if this is true. crbug.com/667470
|
| - if 'Nexus 7' not in self._device.product_model:
|
| - device_recovery.RecoverDevice(self._device, self._env.blacklist)
|
| - else:
|
| - logging.critical('Not attempting device recovery.')
|
| + device_recovery.RecoverDevice(self._device, self._env.blacklist)
|
| except device_errors.CommandTimeoutError:
|
| logging.exception(
|
| 'Device failed to recover after failing %s.', test)
|
|
|