| commit | 1357bd132733ccc23a295739e4bc432d7a53d120 | [log] [tgz] |
|---|---|---|
| author | Octavian Tuchila <octaviant@google.com> | Mon Dec 13 18:16:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 13 18:16:30 2021 +0000 |
| tree | 48e71b0b0ddc784c267f7c2d9f0dc7c81d19719a | |
| parent | 66a71e0d9e89d2b351197bc38ad4027e61cc7394 [diff] | |
| parent | 86b18b837a45380f1b9070cb765ec5864994942c [diff] |
Merge "ui: Fix incorrect trackId usage" am: 86b18b837a Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/1918191 Change-Id: If4ca615bcd137273228c5d8f80421efff31693b4
diff --git a/ui/src/controller/selection_controller.ts b/ui/src/controller/selection_controller.ts index 82f6e22..b5c8762 100644 --- a/ui/src/controller/selection_controller.ts +++ b/ui/src/controller/selection_controller.ts
@@ -378,7 +378,8 @@ const delta = value - previousValue; const duration = endTs - ts; const startTime = fromNs(ts) - globals.state.traceTime.startSec; - const name = globals.state.tracks[trackId].name; + const uiTrackId = globals.state.uiTrackIdByTraceTrackId.get(trackId); + const name = uiTrackId ? globals.state.tracks[uiTrackId].name : undefined; return {startTime, value, delta, duration, name}; }