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

Commit 5fe1de1b authored by Tej Singh's avatar Tej Singh Committed by Automerger Merge Worker
Browse files

Merge "Change package of StatsdStatsLog" into rvc-dev am: 36c9766d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11694353

Change-Id: I2ec831a67c8e031a61e54fc1e5deba0e7f497396
parents d97a8e9a 36c9766d

apex/statsd/framework/Android.bp

+3 −3
Original line number Original line Diff line number Diff line
@@ -20,8 +20,8 @@ genrule { 
    name: "statslog-statsd-java-gen",

    name: "statslog-statsd-java-gen",

    tools: ["stats-log-api-gen"],

    tools: ["stats-log-api-gen"],

    cmd: "$(location stats-log-api-gen) --java $(out) --module statsd" +

    cmd: "$(location stats-log-api-gen) --java $(out) --module statsd" +

         " --javaPackage com.android.internal.util --javaClass StatsdStatsLog",

         " --javaPackage com.android.internal.statsd --javaClass StatsdStatsLog",

    out: ["com/android/internal/util/StatsdStatsLog.java"],

    out: ["com/android/internal/statsd/StatsdStatsLog.java"],

}

}





java_library_static {

java_library_static {
@@ -60,7 +60,7 @@ java_sdk_library { 
        "android.os",

        "android.os",

        "android.util",

        "android.util",

        // From :statslog-statsd-java-gen

        // From :statslog-statsd-java-gen

        "com.android.internal.util",

        "com.android.internal.statsd",

    ],

    ],





    api_packages: [

    api_packages: [

apex/statsd/framework/java/android/util/StatsLog.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ import android.os.IStatsd; 
import android.os.Process;

import android.os.Process;

import android.util.proto.ProtoOutputStream;

import android.util.proto.ProtoOutputStream;





import com.android.internal.util.StatsdStatsLog;

import com.android.internal.statsd.StatsdStatsLog;





/**

/**

 * StatsLog provides an API for developers to send events to statsd. The events can be used to

 * StatsLog provides an API for developers to send events to statsd. The events can be used to