summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/benchmarks/service_worker.py2
-rw-r--r--tools/telemetry/telemetry/core/platform/android_platform_backend.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/tools/perf/benchmarks/service_worker.py b/tools/perf/benchmarks/service_worker.py
index a54e6bb..8a977e2 100644
--- a/tools/perf/benchmarks/service_worker.py
+++ b/tools/perf/benchmarks/service_worker.py
@@ -173,8 +173,6 @@ class _ServiceWorkerMicroBenchmarkMeasurement(page_test.PageTest):
browser_process, 'IOThread', filter_text , results)
-# TODO(ksakamoto): Disabled due to Android One failure. crbug.com/469841
-@benchmark.Disabled('android')
class ServiceWorkerPerfTest(benchmark.Benchmark):
"""Performance test on public applications using ServiceWorker"""
test = _ServiceWorkerMeasurement
diff --git a/tools/telemetry/telemetry/core/platform/android_platform_backend.py b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
index 3648db9..cf7b2fc 100644
--- a/tools/telemetry/telemetry/core/platform/android_platform_backend.py
+++ b/tools/telemetry/telemetry/core/platform/android_platform_backend.py
@@ -323,7 +323,7 @@ class AndroidPlatformBackend(
self._video_recorder = screenshot.VideoRecorder(
self._device, megabits_per_second=min_bitrate_mbps)
self._video_recorder.Start()
- util.WaitFor(self._video_recorder.IsStarted, 5)
+ util.WaitFor(self._video_recorder.IsStarted, 10)
@property
def is_video_capture_running(self):