commit 19b76ac8a3c610dc56296c3aa5727d5d94886ba4
author Hector Dearman <hjd@google.com> Thu Mar 23 10:04:54 2023 +0000
committer Hector Dearman <hjd@google.com> Thu Mar 23 10:25:30 2023 +0000
tree 7eff304b12041ec80a506a17d7384dd427d91527
parent 626360c3bf09ff2aa49fb857bf01a30f00ba2f18

Revert "Revert "[metric] Add android_monitor_contention metric""

This reverts commit a4855d131c526a0c9bbd122174449141af8d73b0.

Change-Id: I5994610d735642a82565670c941ad150107c5f94

Android.bp

diff --git a/Android.bp b/Android.bp
index 6a54053..e3504bc 100644
--- a/Android.bp
+++ b/Android.bp
@@ -4309,6 +4309,7 @@
         "protos/perfetto/metrics/android/lmk_reason_metric.proto",
         "protos/perfetto/metrics/android/mem_metric.proto",
         "protos/perfetto/metrics/android/mem_unagg_metric.proto",
+        "protos/perfetto/metrics/android/monitor_contention_metric.proto",
         "protos/perfetto/metrics/android/multiuser_metric.proto",
         "protos/perfetto/metrics/android/network_metric.proto",
         "protos/perfetto/metrics/android/other_traces.proto",
@@ -4381,6 +4382,7 @@
         "protos/perfetto/metrics/android/lmk_reason_metric.proto",
         "protos/perfetto/metrics/android/mem_metric.proto",
         "protos/perfetto/metrics/android/mem_unagg_metric.proto",
+        "protos/perfetto/metrics/android/monitor_contention_metric.proto",
         "protos/perfetto/metrics/android/multiuser_metric.proto",
         "protos/perfetto/metrics/android/network_metric.proto",
         "protos/perfetto/metrics/android/other_traces.proto",
@@ -9755,6 +9757,7 @@
         "src/trace_processor/metrics/sql/android/android_lmk_reason.sql",
         "src/trace_processor/metrics/sql/android/android_mem.sql",
         "src/trace_processor/metrics/sql/android/android_mem_unagg.sql",
+        "src/trace_processor/metrics/sql/android/android_monitor_contention.sql",
         "src/trace_processor/metrics/sql/android/android_multiuser.sql",
         "src/trace_processor/metrics/sql/android/android_multiuser_populator.sql",
         "src/trace_processor/metrics/sql/android/android_netperf.sql",