From 550b84c5820d7d032d7a25bddb9c499cc0ae9797 Mon Sep 17 00:00:00 2001 From: Muhammad Qureshi Date: Mon, 3 Feb 2020 14:17:59 -0800 Subject: [PATCH] Use FrameworkStatsLog instead of StatsLog As part of statsd becoming a Mainline module in R, autogenerated StatsLog.write() calls are going away and replaced by *StatsLog.java that is autogenerated for each module. This CL replaces some usages of StatsLog with FrameworkStatsLog. Bug: 145952197 Test: m Change-Id: Ifa968468ccdb18d75bac18039c280a56de2336f1 --- cmds/statsd/src/atoms.proto | 2 +- .../server/notification/NotificationRecordLoggerImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto index cc05dbb0639ca..4c0c16f6ac847 100644 --- a/cmds/statsd/src/atoms.proto +++ b/cmds/statsd/src/atoms.proto @@ -378,7 +378,7 @@ message Atom { BootTimeEventUtcTime boot_time_event_utc_time_reported = 241; BootTimeEventErrorCode boot_time_event_error_code_reported = 242 [(module) = "framework"]; UserspaceRebootReported userspace_reboot_reported = 243; - NotificationReported notification_reported = 244; + NotificationReported notification_reported = 244 [(module) = "framework"]; NotificationPanelReported notification_panel_reported = 245; NotificationChannelModified notification_panel_modified = 246; IntegrityCheckResultReported integrity_check_result_reported = 247 [(module) = "framework"]; diff --git a/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java b/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java index 00b4c2b060ace..d61379921f2ed 100644 --- a/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java +++ b/services/core/java/com/android/server/notification/NotificationRecordLoggerImpl.java @@ -16,7 +16,7 @@ package com.android.server.notification; -import android.util.StatsLog; +import com.android.internal.util.FrameworkStatsLog; /** * Standard implementation of NotificationRecordLogger interface. @@ -31,7 +31,7 @@ public class NotificationRecordLoggerImpl implements NotificationRecordLogger { if (!p.shouldLog(buzzBeepBlink)) { return; } - StatsLog.write(StatsLog.NOTIFICATION_REPORTED, + FrameworkStatsLog.write(FrameworkStatsLog.NOTIFICATION_REPORTED, /* int32 event_id = 1 */ p.getUiEvent().getId(), /* int32 uid = 2 */ r.getUid(), /* string package_name = 3 */ r.sbn.getPackageName(),