From 1bb33763540598a8bef4b423fad8d08374306ffa Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Thu, 6 Jan 2022 18:03:08 +0100 Subject: [PATCH 1/2] Update flicker Region import to reflect package change Change-Id: If3e83bbe1c08d473ca252c531d2e46fbde967a34 --- tools/winscope/src/flickerlib/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winscope/src/flickerlib/common.js b/tools/winscope/src/flickerlib/common.js index 7640bbd02..a20b909bc 100644 --- a/tools/winscope/src/flickerlib/common.js +++ b/tools/winscope/src/flickerlib/common.js @@ -80,7 +80,7 @@ const Color = require('flicker').com.android.server.wm.traces.common.Color; const Point = require('flicker').com.android.server.wm.traces.common.Point; const Rect = require('flicker').com.android.server.wm.traces.common.Rect; const RectF = require('flicker').com.android.server.wm.traces.common.RectF; -const Region = require('flicker').com.android.server.wm.traces.common.Region; +const Region = require('flicker').com.android.server.wm.traces.common.region.Region; //Tags const Tag = require('flicker').com.android.server.wm.traces.common.tags.Tag; From 7222795a144bdf5c8d0caa3b4771fa48e3ebbb90 Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Thu, 6 Jan 2022 18:03:13 +0100 Subject: [PATCH 2/2] Wait longer for winscope_status to be ready Traces take longer to be dumped and ready so we need to wait longer before the winscope_status is provided Bug: 213372602 Test: Record a long trace and check that the proxy doesn't crash Change-Id: I0a2aa9bfb667bdad3c909dabbc42b8e111cd3a16 --- tools/winscope/adb_proxy/winscope_proxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winscope/adb_proxy/winscope_proxy.py b/tools/winscope/adb_proxy/winscope_proxy.py index 9a703a3df..b29c19089 100755 --- a/tools/winscope/adb_proxy/winscope_proxy.py +++ b/tools/winscope/adb_proxy/winscope_proxy.py @@ -598,7 +598,7 @@ class TraceThread(threading.Thread): self.out, self.err = self.process.communicate(self.trace_command) log.debug("Trace ended on {}, waiting for cleanup".format(self._device_id)) time.sleep(0.2) - for i in range(10): + for i in range(50): if call_adb("shell su root cat /data/local/tmp/winscope_status", device=self._device_id) == 'TRACE_OK\n': call_adb( "shell su root rm /data/local/tmp/winscope_status", device=self._device_id)