From 109b52ea358e85652ab448570880f26963e4f838 Mon Sep 17 00:00:00 2001 From: Kenzie Davisson Date: Tue, 1 Oct 2024 10:02:22 -0700 Subject: [PATCH] Fix timeline processing for thread name change. --- flutter-candidate.txt | 2 +- .../panes/timeline_events/timeline_events_controller.dart | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/flutter-candidate.txt b/flutter-candidate.txt index 9c9b22f0851..0892039e5de 100644 --- a/flutter-candidate.txt +++ b/flutter-candidate.txt @@ -1 +1 @@ -8925e1ffdfe880b06a8bc5877f017083d6652f5b +b05246d305ac94798ca5429754917c0afa92fd9b diff --git a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_controller.dart b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_controller.dart index cf48f934a99..0638b8b2a09 100644 --- a/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_controller.dart +++ b/packages/devtools_app/lib/src/screens/performance/panes/timeline_events/timeline_events_controller.dart @@ -55,7 +55,7 @@ class TimelineEventsController extends PerformanceFeatureController static const rasterThreadSuffix = '.raster'; static const gpuThreadSuffix = '.gpu'; static const platformThreadSuffix = '.platform'; - static const flutterTestThreadSuffix = '.flutter.test..platform'; + static const flutterTestThreadSuffix = '.flutter.test..ui'; static final _refreshWorkTrackerDelay = const Duration(milliseconds: 500).inMicroseconds; @@ -281,7 +281,8 @@ class TimelineEventsController extends PerformanceFeatureController // Android: "1.ui (12652)" // iOS: "io.flutter.1.ui (12652)" // MacOS, Linux, Windows, Dream (g3): "io.flutter.ui (225695)" - if (name.contains(uiThreadSuffix)) { + if (name.contains(uiThreadSuffix) && + !name.contains(flutterTestThreadSuffix)) { uiTrackId = id; }