Merge "Add more trace categories." into pi-dev

am: 6d9f7943fb

Change-Id: Ib0817f4a53ab63e895a8a57d33841a362e358fa6
This commit is contained in:
gopinath
2018-04-19 19:50:52 -07:00
committed by android-build-merger

View File

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