summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2018-04-20 02:12:44 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-04-20 02:12:44 +0000
commit6d9f7943fb1ce93c12b1c7c710d9dbbbd761ab0a (patch)
treecd96eac134c26f681d3639548f9694a508476f21
parent1c75189a0adcf4f3a3739f622580dc3983c137fb (diff)
parent21799f8b05041acf0ec89c02077f5e3e7513344d (diff)
Merge "Add more trace categories." into pi-dev
-rw-r--r--tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
index dd56e0e41164..4ca175feaff2 100644
--- a/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
+++ b/tests/AppLaunch/src/com/android/tests/applaunch/AppLaunch.java
@@ -98,7 +98,7 @@ public class AppLaunch extends InstrumentationTestCase {
private static final String LAUNCH_FILE = "applaunch.txt";
private static final String TRACE_SUB_DIRECTORY = "atrace_logs";
private static final String DEFAULT_TRACE_CATEGORIES =
- "sched,freq,gfx,view,dalvik,webview,input,wm,disk,am,wm";
+ "sched,freq,gfx,view,dalvik,webview,input,wm,disk,am,wm,binder_driver,hal";
private static final String DEFAULT_TRACE_BUFFER_SIZE = "20000";
private static final String DEFAULT_TRACE_DUMP_INTERVAL = "10";
private static final String TRIAL_LAUNCH = "TRIAL_LAUNCH";
@@ -310,7 +310,8 @@ public class AppLaunch extends InstrumentationTestCase {
try {
atraceLogger.atraceStart(traceCategoriesSet, traceBufferSize,
traceDumpInterval, rootTraceSubDir,
- String.format("%s-%s", launch.getApp(), launch.getLaunchReason()));
+ String.format("%s-%s-%s", launch.getApp(),
+ launch.getCompilerFilter(), launch.getLaunchReason()));
startApp(launch.getApp(), launch.getLaunchReason());
sleep(POST_LAUNCH_IDLE_TIMEOUT);
} finally {