diff --git a/libs/utils/android/system.py b/libs/utils/android/system.py old mode 100644 new mode 100755 index 42e8c4dec7516ea88b6011d7bedb357baa55a72f..b8fe98848a66c9813f8a534f5f809923ad377a68 --- a/libs/utils/android/system.py +++ b/libs/utils/android/system.py @@ -30,11 +30,17 @@ class System(object): """ @staticmethod - def systrace_start(target, trace_file, time=None, - events=['gfx', 'view', 'sched', 'freq', 'idle']): + def systrace_start(target, trace_file, time=None): log = logging.getLogger('System') + # Load the list of events for systrace from the target conf file + if ('systrace' in target.conf) and ('events' in target.conf['systrace']): + events = target.conf['systrace']['events'] + # Default list of events to capture + else: + events = ['gfx', 'view', 'sched', 'freq', 'idle'] + # Check which systrace binary is available under CATAPULT_HOME for systrace in ['systrace.py', 'run_systrace.py']: systrace_path = os.path.join(target.CATAPULT_HOME, 'systrace',