From 0921e2cf39ffc5bf622dd0bd554f7e1a536221c4 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Fri, 9 Nov 2018 14:01:21 -0800 Subject: [PATCH] Logging clean up: remove a logging API that nobody calls. Bug: 117860032 Test: rebuild Change-Id: I984320b7196369331aff783673a5981a7a89f3d2 --- .../core/instrumentation/EventLogWriter.java | 48 ++++++++++--------- .../core/instrumentation/LogWriter.java | 21 +------- .../MetricsFeatureProvider.java | 17 ++++--- 3 files changed, 38 insertions(+), 48 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java index 027ca094e3225..d5afee94c3b98 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/EventLogWriter.java @@ -18,6 +18,7 @@ package com.android.settingslib.core.instrumentation; import android.content.Context; import android.metrics.LogMaker; +import android.text.TextUtils; import android.util.Pair; import com.android.internal.logging.MetricsLogger; @@ -30,6 +31,7 @@ public class EventLogWriter implements LogWriter { private final MetricsLogger mMetricsLogger = new MetricsLogger(); + @Override public void visible(Context context, int source, int category) { final LogMaker logMaker = new LogMaker(category) .setType(MetricsProto.MetricsEvent.TYPE_OPEN) @@ -37,32 +39,17 @@ public class EventLogWriter implements LogWriter { MetricsLogger.action(logMaker); } + @Override public void hidden(Context context, int category) { MetricsLogger.hidden(context, category); } - public void action(int category, int value, Pair... taggedData) { - if (taggedData == null || taggedData.length == 0) { - mMetricsLogger.action(category, value); - } else { - final LogMaker logMaker = new LogMaker(category) - .setType(MetricsProto.MetricsEvent.TYPE_ACTION) - .setSubtype(value); - for (Pair pair : taggedData) { - logMaker.addTaggedData(pair.first, pair.second); - } - mMetricsLogger.write(logMaker); - } - } - - public void action(int category, boolean value, Pair... taggedData) { - action(category, value ? 1 : 0, taggedData); - } - + @Override public void action(Context context, int category, Pair... taggedData) { action(context, category, "", taggedData); } + @Override public void actionWithSource(Context context, int source, int category) { final LogMaker logMaker = new LogMaker(category) .setType(MetricsProto.MetricsEvent.TYPE_ACTION); @@ -72,18 +59,17 @@ public class EventLogWriter implements LogWriter { MetricsLogger.action(logMaker); } - /** @deprecated use {@link #action(int, int, Pair[])} */ - @Deprecated + @Override public void action(Context context, int category, int value) { MetricsLogger.action(context, category, value); } - /** @deprecated use {@link #action(int, boolean, Pair[])} */ - @Deprecated + @Override public void action(Context context, int category, boolean value) { MetricsLogger.action(context, category, value); } + @Override public void action(Context context, int category, String pkg, Pair... taggedData) { if (taggedData == null || taggedData.length == 0) { @@ -99,7 +85,25 @@ public class EventLogWriter implements LogWriter { } } + @Override public void count(Context context, String name, int value) { MetricsLogger.count(context, name, value); } + + @Override + public void action(int attribution, int action, int pageId, String key, int value) { + final LogMaker logMaker = new LogMaker(action) + .setType(MetricsProto.MetricsEvent.TYPE_ACTION); + if (attribution != MetricsProto.MetricsEvent.VIEW_UNKNOWN) { + logMaker.addTaggedData(MetricsProto.MetricsEvent.FIELD_CONTEXT, pageId); + } + if (!TextUtils.isEmpty(key)) { + logMaker.addTaggedData(MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_NAME, + key); + logMaker.addTaggedData( + MetricsProto.MetricsEvent.FIELD_SETTINGS_PREFERENCE_CHANGE_INT_VALUE, + value); + } + MetricsLogger.action(logMaker); + } } diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/LogWriter.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/LogWriter.java index a16838c7fe1f4..16ae7103e3748 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/LogWriter.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/LogWriter.java @@ -33,16 +33,6 @@ public interface LogWriter { */ void hidden(Context context, int category); - /** - * Logs a user action. - */ - void action(int category, int value, Pair... taggedData); - - /** - * Logs a user action. - */ - void action(int category, boolean value, Pair... taggedData); - /** * Logs an user action. */ @@ -55,18 +45,12 @@ public interface LogWriter { /** * Logs an user action. - * - * @deprecated use {@link #action(int, int, Pair[])} */ - @Deprecated void action(Context context, int category, int value); /** * Logs an user action. - * - * @deprecated use {@link #action(int, boolean, Pair[])} */ - @Deprecated void action(Context context, int category, boolean value); /** @@ -80,8 +64,7 @@ public interface LogWriter { void count(Context context, String name, int value); /** - * Generically log action into statsd. + * Generically log action. */ - default void action(int attribution, int action, int pageId, String key, int value) { - } + void action(int attribution, int action, int pageId, String key, int value); } diff --git a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/MetricsFeatureProvider.java b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/MetricsFeatureProvider.java index 69c267e6d3dc6..50834bc85ec9a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/MetricsFeatureProvider.java +++ b/packages/SettingsLib/src/com/android/settingslib/core/instrumentation/MetricsFeatureProvider.java @@ -65,6 +65,16 @@ public class MetricsFeatureProvider { } } + /** + * Logs a generic Settings event. + */ + public void action(Context context, int category, String pkg, + Pair... taggedData) { + for (LogWriter writer : mLoggerWriters) { + writer.action(context, category, pkg, taggedData); + } + } + /** * Logs a generic Settings event. */ @@ -86,13 +96,6 @@ public class MetricsFeatureProvider { } } - public void action(Context context, int category, String pkg, - Pair... taggedData) { - for (LogWriter writer : mLoggerWriters) { - writer.action(context, category, pkg, taggedData); - } - } - public void count(Context context, String name, int value) { for (LogWriter writer : mLoggerWriters) { writer.count(context, name, value);