From 058db967d9adf86d8e2c6a3287864fab70803aa9 Mon Sep 17 00:00:00 2001
From: Tej Singh <singhtejinder@google.com>
Date: Mon, 1 Jun 2020 18:12:18 -0700
Subject: [PATCH] Change package of StatsdStatsLog

Change package of StatsdStatsLog from com.android.internal.util to
com.android.internal.statsd

Test: atest GtsStatsdHostTestCases
Bug: 157649935
Change-Id: Iee2af03c950b7cc054f7d77e721694a7f429ae9d
---
 apex/statsd/framework/Android.bp                      | 6 +++---
 apex/statsd/framework/java/android/util/StatsLog.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 78496c4074f84..19f0e6f0994f9 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -20,8 +20,8 @@ genrule {
     name: "statslog-statsd-java-gen",
     tools: ["stats-log-api-gen"],
     cmd: "$(location stats-log-api-gen) --java $(out) --module statsd" +
-         " --javaPackage com.android.internal.util --javaClass StatsdStatsLog",
-    out: ["com/android/internal/util/StatsdStatsLog.java"],
+         " --javaPackage com.android.internal.statsd --javaClass StatsdStatsLog",
+    out: ["com/android/internal/statsd/StatsdStatsLog.java"],
 }
 
 java_library_static {
@@ -65,7 +65,7 @@ java_sdk_library {
         "android.os",
         "android.util",
         // From :statslog-statsd-java-gen
-        "com.android.internal.util",
+        "com.android.internal.statsd",
     ],
 
     api_packages: [
diff --git a/apex/statsd/framework/java/android/util/StatsLog.java b/apex/statsd/framework/java/android/util/StatsLog.java
index 4eeae57fe1954..0a9f4ebabdf07 100644
--- a/apex/statsd/framework/java/android/util/StatsLog.java
+++ b/apex/statsd/framework/java/android/util/StatsLog.java
@@ -28,7 +28,7 @@ import android.os.IStatsd;
 import android.os.Process;
 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