From 50dfb297cd1dfc2082a60a25e422796869b97186 Mon Sep 17 00:00:00 2001 From: Sergei Trofimov Date: Wed, 13 Sep 2017 11:36:41 +0100 Subject: utils/rendering: fix surfaceflinger list SurfaceFlingerFrameCollector.list now converts line endings before splitting, so it now works when the endings are something other than "\r\n". --- devlib/utils/rendering.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'devlib') diff --git a/devlib/utils/rendering.py b/devlib/utils/rendering.py index 9ab1e00..a273cc7 100644 --- a/devlib/utils/rendering.py +++ b/devlib/utils/rendering.py @@ -122,7 +122,8 @@ class SurfaceFlingerFrameCollector(FrameCollector): return self.target.execute(cmd.format(activity)) def list(self): - return self.target.execute('dumpsys SurfaceFlinger --list').split('\r\n') + text = self.target.execute('dumpsys SurfaceFlinger --list') + return text.replace('\r\n', '\n').replace('\r', '\n').split('\n') def _process_raw_file(self, fh): text = fh.read().replace('\r\n', '\n').replace('\r', '\n') -- cgit v1.2.3