Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56743aa5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Migrate to SettingsStatsLog from StatsLog"

parents 1608f9da 0454b279

Android.bp

+16 −0
Original line number Diff line number Diff line
@@ -4,6 +4,21 @@ java_library { 
    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

android_library {

    name: "Settings-core",
@@ -37,6 +52,7 @@ android_library { 
        "settings-log-bridge-protos-lite",

        "contextualcards",

        "settings-logtags",

        "statslog-settings",

        "zxing-core-1.7",

    ],

src/com/android/settings/core/instrumentation/StatsLogWriter.java

+3 −4
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settings.core.instrumentation; 
import android.app.settings.SettingsEnums;

import android.content.Context;

import android.util.Pair;

import android.util.StatsLog;



import com.android.settingslib.core.instrumentation.LogWriter;
@@ -27,7 +26,7 @@ public class StatsLogWriter implements LogWriter { 


    @Override

    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 */

                SettingsEnums.PAGE_VISIBLE /* action */,

                pageId, /* target pageId */
@@ -37,7 +36,7 @@ public class StatsLogWriter implements LogWriter { 


    @Override

    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_HIDE /* action */,

                pageId,
@@ -83,7 +82,7 @@ public class StatsLogWriter implements LogWriter { 


    @Override

    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,

                action,

                pageId,