aboutsummaryrefslogtreecommitdiff
path: root/devlib
diff options
context:
space:
mode:
authorSergei Trofimov <sergei.trofimov@arm.com>2017-09-13 11:36:41 +0100
committerSergei Trofimov <sergei.trofimov@arm.com>2017-09-27 10:44:43 +0100
commit50dfb297cd1dfc2082a60a25e422796869b97186 (patch)
treed50b6f6d074fd7390558cfc14c4ebaee28fb62ce /devlib
parenta8ca0fc6c834a2e3e145e6d102fff9133cee2db6 (diff)
downloaddevlib-50dfb297cd1dfc2082a60a25e422796869b97186.tar.gz
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".
Diffstat (limited to 'devlib')
-rw-r--r--devlib/utils/rendering.py3
1 files changed, 2 insertions, 1 deletions
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')