| Index: build/android/pylib/screenshot.py
|
| diff --git a/build/android/pylib/screenshot.py b/build/android/pylib/screenshot.py
|
| index e21d7560b6e5854193362701e91d7935073fca60..2704631d0244e68628489b394e0efafd7ec92b23 100644
|
| --- a/build/android/pylib/screenshot.py
|
| +++ b/build/android/pylib/screenshot.py
|
| @@ -5,6 +5,7 @@
|
| import os
|
| import signal
|
| import tempfile
|
| +import time
|
|
|
| from pylib import cmd_helper
|
|
|
| @@ -82,10 +83,13 @@ class VideoRecorder(object):
|
| Returns:
|
| Output video file name on the host.
|
| """
|
| - host_file_name = host_file or ('screen-recording-%s.mp4' %
|
| - self._device.old_interface.GetTimestamp())
|
| + # TODO(jbudorick): Merge filename generation with the logic for doing so in
|
| + # DeviceUtils.
|
| + host_file_name = (
|
| + host_file
|
| + or 'screen-recording-%s.mp4' % time.strftime('%Y%m%dT%H%M%S',
|
| + time.localtime()))
|
| host_file_name = os.path.abspath(host_file_name)
|
| - self._device.old_interface.EnsureHostDirectory(host_file_name)
|
| self._device.PullFile(self._device_file, host_file_name)
|
| self._device.RunShellCommand('rm -f "%s"' % self._device_file)
|
| return host_file_name
|
|
|