Merge "Add classloader to heap graph proto."
diff --git a/src/traced/probes/ftrace/ftrace_controller.cc b/src/traced/probes/ftrace/ftrace_controller.cc
index a4509bd..c786a34 100644
--- a/src/traced/probes/ftrace/ftrace_controller.cc
+++ b/src/traced/probes/ftrace/ftrace_controller.cc
@@ -97,14 +97,9 @@
} // namespace
const char* const FtraceController::kTracingPaths[] = {
-#if PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID)
"/sys/kernel/tracing/",
"/sys/kernel/debug/tracing/",
nullptr,
-#else
- "/sys/kernel/debug/tracing/",
- nullptr,
-#endif
};
// Method of last resort to reset ftrace state.
diff --git a/ui/src/controller/search_controller.ts b/ui/src/controller/search_controller.ts
index 0c93ecd..7ec474f 100644
--- a/ui/src/controller/search_controller.ts
+++ b/ui/src/controller/search_controller.ts
@@ -198,10 +198,16 @@
cpuToTrackId.set((track.config as {cpu: number}).cpu, track.id);
continue;
}
- if (track.kind === 'ChromeSliceTrack' ||
- track.kind === 'AsyncSliceTrack') {
- engineTrackIdToTrackId.set(
- (track.config as {trackId: number}).trackId, track.id);
+ if (track.kind === 'ChromeSliceTrack') {
+ const config = (track.config as {trackId: number});
+ engineTrackIdToTrackId.set(config.trackId, track.id);
+ continue;
+ }
+ if (track.kind === 'AsyncSliceTrack') {
+ const config = (track.config as {trackIds: number[]});
+ for (const trackId of config.trackIds) {
+ engineTrackIdToTrackId.set(trackId, track.id);
+ }
continue;
}
}