Migrate to SettingsStatsLog from 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 adds autogenerated SettingsStatsLog and replaces usages
of StatsLog with SettingsStatsLog.

Bug: 145952197
Test: m
Change-Id: I3ffdb51394017e3e48b65734d67595abd69dd70d
This commit is contained in:
Muhammad Qureshi
2020-01-23 14:33:47 -08:00
parent f9a1252378
commit 0454b2798b
2 changed files with 19 additions and 4 deletions

View File

@@ -4,6 +4,21 @@ java_library {
static_libs: ["WifiTrackerLib"], static_libs: ["WifiTrackerLib"],
} }
genrule {
name: "statslog-settings-java-gen",
tools: ["stats-log-api-gen"],
cmd: "$(location stats-log-api-gen) --java $(out) --module settings"
+ " --javaPackage com.android.settings.core.instrumentation --javaClass SettingsStatsLog",
out: ["com/android/settings/core/instrumentation/SettingsStatsLog.java"],
}
java_library {
name: "statslog-settings",
srcs: [
":statslog-settings-java-gen",
],
}
// Build the Settings APK // Build the Settings APK
android_library { android_library {
name: "Settings-core", name: "Settings-core",
@@ -37,6 +52,7 @@ android_library {
"settings-log-bridge-protos-lite", "settings-log-bridge-protos-lite",
"contextualcards", "contextualcards",
"settings-logtags", "settings-logtags",
"statslog-settings",
"zxing-core-1.7", "zxing-core-1.7",
], ],

View File

@@ -19,7 +19,6 @@ package com.android.settings.core.instrumentation;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.util.Pair; import android.util.Pair;
import android.util.StatsLog;
import com.android.settingslib.core.instrumentation.LogWriter; import com.android.settingslib.core.instrumentation.LogWriter;
@@ -27,7 +26,7 @@ public class StatsLogWriter implements LogWriter {
@Override @Override
public void visible(Context context, int attribution, int pageId, int latency) { public void visible(Context context, int attribution, int pageId, int latency) {
StatsLog.write(StatsLog.SETTINGS_UI_CHANGED /* Atom name */, SettingsStatsLog.write(SettingsStatsLog.SETTINGS_UI_CHANGED /* Atom name */,
attribution, /* from pageId */ attribution, /* from pageId */
SettingsEnums.PAGE_VISIBLE /* action */, SettingsEnums.PAGE_VISIBLE /* action */,
pageId, /* target pageId */ pageId, /* target pageId */
@@ -37,7 +36,7 @@ public class StatsLogWriter implements LogWriter {
@Override @Override
public void hidden(Context context, int pageId, int visibleTime) { public void hidden(Context context, int pageId, int visibleTime) {
StatsLog.write(StatsLog.SETTINGS_UI_CHANGED /* Atom name */, SettingsStatsLog.write(SettingsStatsLog.SETTINGS_UI_CHANGED /* Atom name */,
SettingsEnums.PAGE_UNKNOWN /* attribution */, SettingsEnums.PAGE_UNKNOWN /* attribution */,
SettingsEnums.PAGE_HIDE /* action */, SettingsEnums.PAGE_HIDE /* action */,
pageId, pageId,
@@ -83,7 +82,7 @@ public class StatsLogWriter implements LogWriter {
@Override @Override
public void action(int attribution, int action, int pageId, String key, int value) { public void action(int attribution, int action, int pageId, String key, int value) {
StatsLog.write(StatsLog.SETTINGS_UI_CHANGED /* atomName */, SettingsStatsLog.write(SettingsStatsLog.SETTINGS_UI_CHANGED /* atomName */,
attribution, attribution,
action, action,
pageId, pageId,