Fix DrawFrame matching in android metrics
Similar to aosp/1627259. ag/13728272 changed the DrawFrame logging.
Updating the metrics to handle the new format
Change-Id: I998e488ec44dd9ad9f086e352e99245e5ac32042
diff --git a/src/trace_processor/metrics/android/android_hwui_metric.sql b/src/trace_processor/metrics/android/android_hwui_metric.sql
index 83f295a..585e515 100644
--- a/src/trace_processor/metrics/android/android_hwui_metric.sql
+++ b/src/trace_processor/metrics/android/android_hwui_metric.sql
@@ -39,7 +39,7 @@
thread_track.utid as render_thread_id
FROM slice
INNER JOIN thread_track ON (thread_track.id = slice.track_id)
-WHERE slice.name='DrawFrame' AND slice.dur >= 0
+WHERE slice.name LIKE 'DrawFrame%' AND slice.dur >= 0
GROUP BY thread_track.utid;
DROP VIEW IF EXISTS hwui_flush_commands;
diff --git a/src/trace_processor/metrics/android/hsc_startups.sql b/src/trace_processor/metrics/android/hsc_startups.sql
index 62b86f2..b07f545 100644
--- a/src/trace_processor/metrics/android/hsc_startups.sql
+++ b/src/trace_processor/metrics/android/hsc_startups.sql
@@ -75,7 +75,7 @@
FROM frame_times
INNER JOIN launches on launches.package LIKE '%' || frame_times.name || '%'
WHERE frame_times.name LIKE "%id.calendar%" AND frame_times.launch_id = launches.id
-ORDER BY ABS(frame_times.ts_end - (SELECT ts + dur FROM functions WHERE function_name LIKE "DrawFrame" AND process_name LIKE "%id.calendar" ORDER BY ts LIMIT 1)) LIMIT 1;
+ORDER BY ABS(frame_times.ts_end - (SELECT ts + dur FROM functions WHERE function_name LIKE "DrawFrame%" AND process_name LIKE "%id.calendar" ORDER BY ts LIMIT 1)) LIMIT 1;
-- Camera
INSERT INTO hsc_based_startup_times
diff --git a/test/trace_processor/graphics/android_jank.py b/test/trace_processor/graphics/android_jank.py
index d2195a3..ba6a628 100644
--- a/test/trace_processor/graphics/android_jank.py
+++ b/test/trace_processor/graphics/android_jank.py
@@ -91,7 +91,7 @@
trace.add_atrace_end(ts=119_000_000, tid=2000, pid=2000)
trace.add_atrace_end(ts=120_000_000, tid=2000, pid=2000)
-trace.add_atrace_begin(ts=105_000_000, tid=2001, pid=2000, buf='DrawFrame')
+trace.add_atrace_begin(ts=105_000_000, tid=2001, pid=2000, buf='DrawFrames 3')
trace.add_atrace_begin(
ts=108_000_000, tid=2001, pid=2000, buf='Upload 300x300 Texture')
trace.add_atrace_end(ts=112_000_000, tid=2001, pid=2000)
