From 4a46eaf3dd6f1b4c1da4e3fd05fd6635f6752858 Mon Sep 17 00:00:00 2001 From: Will Brockman Date: Tue, 22 Sep 2020 14:54:53 -0400 Subject: [PATCH] Statsd logging: Fix UiEvent logging instance IDs. Add the instance ID field to statsd UiEventReported calls that lacked it, because all statsd writes should write all fields. Fixes: 168760953 Test: atest NotificationManagerServiceTest Change-Id: I8a6fb7a9e52c2fd818e2b92c62ea5902583b6f9f --- .../android/internal/logging/UiEventLoggerImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/core/java/com/android/internal/logging/UiEventLoggerImpl.java b/core/java/com/android/internal/logging/UiEventLoggerImpl.java index c9156c13aae32..c0f44a5eb39b5 100644 --- a/core/java/com/android/internal/logging/UiEventLoggerImpl.java +++ b/core/java/com/android/internal/logging/UiEventLoggerImpl.java @@ -33,7 +33,11 @@ public class UiEventLoggerImpl implements UiEventLogger { public void log(UiEventEnum event, int uid, String packageName) { final int eventID = event.getId(); if (eventID > 0) { - FrameworkStatsLog.write(FrameworkStatsLog.UI_EVENT_REPORTED, eventID, uid, packageName); + FrameworkStatsLog.write(FrameworkStatsLog.UI_EVENT_REPORTED, + /* event_id = 1 */ eventID, + /* uid = 2 */ uid, + /* package_name = 3 */ packageName, + /* instance_id = 4 */ 0); } } @@ -42,8 +46,11 @@ public class UiEventLoggerImpl implements UiEventLogger { InstanceId instance) { final int eventID = event.getId(); if ((eventID > 0) && (instance != null)) { - FrameworkStatsLog.write(FrameworkStatsLog.UI_EVENT_REPORTED, eventID, uid, packageName, - instance.getId()); + FrameworkStatsLog.write(FrameworkStatsLog.UI_EVENT_REPORTED, + /* event_id = 1 */ eventID, + /* uid = 2 */ uid, + /* package_name = 3 */ packageName, + /* instance_id = 4 */ instance.getId()); } else { log(event, uid, packageName); }