Merge "Support ad hoc counters in the framework"

2 files changed, 12 insertions, 0 deletions

diff --git a/core/java/com/android/internal/logging/EventLogTags.logtags b/core/java/com/android/internal/logging/EventLogTags.logtags
index 870d20d..b9208ff 100644
--- a/core/java/com/android/internal/logging/EventLogTags.logtags
+++ b/core/java/com/android/internal/logging/EventLogTags.logtags
@@ -5,3 +5,5 @@ option java_package com.android.internal.logging;
 # interaction logs
 524287 sysui_view_visibility (category|1|5),(visible|1|6)
 524288 sysui_action (category|1|5)
+524290 sysui_count (name|3),(increment|1)
+524291 sysui_histogram (name|3),(bucket|1)
diff --git a/core/java/com/android/internal/logging/MetricsLogger.java b/core/java/com/android/internal/logging/MetricsLogger.java
index f38229a..6be6389 100644
--- a/core/java/com/android/internal/logging/MetricsLogger.java
+++ b/core/java/com/android/internal/logging/MetricsLogger.java
@@ -50,4 +50,14 @@ public class MetricsLogger implements MetricsConstants {
         }
         EventLogTags.writeSysuiAction(category);
     }
+
+    /** Add an integer value to the monotonically increasing counter with the given name. */
+    public static void count(Context context, String name, int value) {
+        EventLogTags.writeSysuiCount(name, value);
+    }
+
+    /** Increment the bucket with the integer label on the histogram with the given name. */
+    public static void histogram(Context context, String name, int bucket) {
+        EventLogTags.writeSysuiHistogram(name, bucket);
+    }
 }