| commit | 71f8acdba9f2ff9d8bdb22cf40e17cdb87d73f3f | [log] [tgz] |
|---|---|---|
| author | Primiano Tucci <primiano@google.com> | Tue Sep 03 16:30:12 2024 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Sep 03 16:30:12 2024 +0000 |
| tree | df2f6892865ce23e8edb11c2287b3b8caf4f1540 | |
| parent | 16d38b107f70dcdb857438579a1465e7f69fc750 [diff] | |
| parent | b2ee314e95d601754614044493ae15445effe57c [diff] |
Merge "ui: rename PluginContext(Trace) to App/Trace" into main
diff --git a/ui/src/plugins/dev.perfetto.PinAndroidPerfMetrics/handlers/fullTraceJankMetricHandler.ts b/ui/src/plugins/dev.perfetto.PinAndroidPerfMetrics/handlers/fullTraceJankMetricHandler.ts index 7f4aaba..55d1821 100644 --- a/ui/src/plugins/dev.perfetto.PinAndroidPerfMetrics/handlers/fullTraceJankMetricHandler.ts +++ b/ui/src/plugins/dev.perfetto.PinAndroidPerfMetrics/handlers/fullTraceJankMetricHandler.ts
@@ -66,13 +66,16 @@ trackName: string; } { let jankTypeFilter; - let jankTypeDisplayName = 'all'; + let jankTypeDisplayName; if (metricData.jankType?.includes('app')) { jankTypeFilter = ' android_is_app_jank_type(display_value)'; jankTypeDisplayName = 'app'; } else if (metricData.jankType?.includes('sf')) { jankTypeFilter = ' android_is_sf_jank_type(display_value)'; jankTypeDisplayName = 'sf'; + } else { + jankTypeFilter = " display_value != 'None'"; + jankTypeDisplayName = 'all'; } const processName = metricData.process;
diff --git a/ui/src/plugins/dev.perfetto.PinAndroidPerfMetrics/handlers/metricUtils.ts b/ui/src/plugins/dev.perfetto.PinAndroidPerfMetrics/handlers/metricUtils.ts index 8a53414..9bb7201 100644 --- a/ui/src/plugins/dev.perfetto.PinAndroidPerfMetrics/handlers/metricUtils.ts +++ b/ui/src/plugins/dev.perfetto.PinAndroidPerfMetrics/handlers/metricUtils.ts
@@ -113,6 +113,8 @@ return 'com.android.systemui'; } else if (metricProcessName.includes('launcher')) { return 'com.google.android.apps.nexuslauncher'; + } else if (metricProcessName.includes('surfaceflinger')) { + return '/system/bin/surfaceflinger'; } else { return metricProcessName; }