LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I0a2aa9bf,If3e83bbe

Browse Source 
* changes:
  Wait longer for winscope_status to be ready
  Update flicker Region import to reflect package change
This commit is contained in:
TreeHugger Robot
2022-01-06 18:00:00 +00:00
committed by Android (Google) Code Review
parent da02186f3d 7222795a14
commit 9454630fc9
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/winscope/adb_proxy/winscope_proxy.py
View File

@@ -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)

2
tools/winscope/src/flickerlib/common.js
View File

@@ -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;