Merge "heapprofd tests: skip all devices with an x86-like primary ABI"
diff --git a/protos/perfetto/trace/android/packages_list.proto b/protos/perfetto/trace/android/packages_list.proto
index 6412ea5..52faba0 100644
--- a/protos/perfetto/trace/android/packages_list.proto
+++ b/protos/perfetto/trace/android/packages_list.proto
@@ -29,6 +29,6 @@
repeated Package packages = 1;
- // At least one error occured parsing the packages.list.
+ // At least one error occurred parsing the packages.list.
optional bool error = 2;
}
diff --git a/protos/perfetto/trace/perfetto_trace.proto b/protos/perfetto/trace/perfetto_trace.proto
index 4e4aa65..c29802a 100644
--- a/protos/perfetto/trace/perfetto_trace.proto
+++ b/protos/perfetto/trace/perfetto_trace.proto
@@ -253,7 +253,7 @@
repeated Package packages = 1;
- // At least one error occured parsing the packages.list.
+ // At least one error occurred parsing the packages.list.
optional bool error = 2;
}
diff --git a/ui/src/frontend/record_page.ts b/ui/src/frontend/record_page.ts
index 286e004..9b3e202 100644
--- a/ui/src/frontend/record_page.ts
+++ b/ui/src/frontend/record_page.ts
@@ -187,13 +187,6 @@
get: (cfg) => cfg.batteryDrainPollMs
} as SliderAttrs)),
m(Probe, {
- title: 'CPU frequency and idle states',
- img: 'rec_cpu_freq.png',
- descr: 'Records cpu frequency and idle state changes via ftrace',
- setEnabled: (cfg, val) => cfg.cpuFreq = val,
- isEnabled: (cfg) => cfg.cpuFreq
- } as ProbeAttrs),
- m(Probe, {
title: 'Board voltages & frequencies',
img: 'rec_board_voltage.png',
descr: 'Tracks voltage and frequency changes from board sensors',
@@ -230,6 +223,13 @@
isEnabled: (cfg) => cfg.cpuSched
} as ProbeAttrs),
m(Probe, {
+ title: 'CPU frequency and idle states',
+ img: 'rec_cpu_freq.png',
+ descr: 'Records cpu frequency and idle state changes via ftrace',
+ setEnabled: (cfg, val) => cfg.cpuFreq = val,
+ isEnabled: (cfg) => cfg.cpuFreq
+ } as ProbeAttrs),
+ m(Probe, {
title: 'Scheduling chains / latency analysis',
img: 'rec_cpu_wakeup.png',
descr: `Tracks causality of scheduling transitions. When a task