commit a16efc4f1b3482a93ecc54d50e06bb449da3e2b7
author Simon MacMullen <simonmacm@google.com> Tue Feb 28 18:21:05 2023 +0000
committer Simon MacMullen <simonmacm@google.com> Tue Feb 28 18:24:16 2023 +0000
tree be2ec53946c019a2ae7be5a4d4dd38ff1cab0cc7
parent cedf168384eccb1f62e66fdea8102983d977182a

Fixes to counter_span_view_merged.

* Don't require globalness the way global_span_view does.
* Rename it to make that clearer.
* Use it consistently when assembling android_batt_event.

This fixes incorrect appearance of the friendly charging / plug type tracks. We were only taking note of the system properties, not atrace events when building them.

Bug: 270696978
Change-Id: I546da24de249d3473d04fb25d45ce0c5a43a07ef

Android.bp

diff --git a/Android.bp b/Android.bp
index 212882f..a8d21de 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9700,13 +9700,13 @@
         "src/trace_processor/metrics/sql/android/android_trusty_workqueues.sql",
         "src/trace_processor/metrics/sql/android/composer_execution.sql",
         "src/trace_processor/metrics/sql/android/composition_layers.sql",
+        "src/trace_processor/metrics/sql/android/counter_span_view_merged.sql",
         "src/trace_processor/metrics/sql/android/cpu_info.sql",
         "src/trace_processor/metrics/sql/android/display_metrics.sql",
         "src/trace_processor/metrics/sql/android/frame_missed.sql",
         "src/trace_processor/metrics/sql/android/g2d.sql",
         "src/trace_processor/metrics/sql/android/g2d_duration.sql",
         "src/trace_processor/metrics/sql/android/global_counter_span_view.sql",
-        "src/trace_processor/metrics/sql/android/global_counter_span_view_merged.sql",
         "src/trace_processor/metrics/sql/android/gpu_counter_span_view.sql",
         "src/trace_processor/metrics/sql/android/jank/cujs.sql",
         "src/trace_processor/metrics/sql/android/jank/cujs_boundaries.sql",