| Index: tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py
|
| diff --git a/tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py b/tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py
|
| index 3f7a080f19d8f7f638ee490483078e78116e8727..e10d9c1692196628cf9f842c29aa6c2493d25066 100644
|
| --- a/tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py
|
| +++ b/tools/telemetry/telemetry/core/platform/profiler/android_traceview_profiler.py
|
| @@ -2,6 +2,7 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +import logging
|
| import os
|
|
|
| from telemetry.core.backends.chrome import android_browser_finder
|
| @@ -58,8 +59,12 @@ class AndroidTraceviewProfiler(profiler.Profiler):
|
| # pylint: disable=cell-var-from-loop
|
| util.WaitFor(lambda: self._FileSize(trace_file) > 0, timeout=10)
|
| output_files.append(trace_file)
|
| - self._browser_backend.adb.device().PullFile(
|
| - self._DEFAULT_DEVICE_DIR, self._output_path)
|
| + try:
|
| + self._browser_backend.adb.device().PullFile(
|
| + self._DEFAULT_DEVICE_DIR, self._output_path)
|
| + except:
|
| + logging.exception('New exception caused by DeviceUtils conversion')
|
| + raise
|
| self._browser_backend.adb.RunShellCommand(
|
| 'rm ' + os.path.join(self._DEFAULT_DEVICE_DIR, '*'))
|
| print 'Traceview profiles available in ', self._output_path
|
|
|