commit 756e44741e4da827ecdece470de7da95d649f56d
author Howard Ro <yro@google.com> Tue Feb 04 06:38:37 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 04 06:38:37 2020 +0000
tree 5df423384540bd4ab5e93d31bd04d83c5099030c
parent f2ed0271a5f9fc46f50d042a8e1c2df39bd5f719
parent 8ffe1eae8be2c7344aa95f937eee8f8255526202

Merge "Move StatsDimensionsValue.java to statsd apex"

apex/statsd/framework/Android.bp

diff --git a/apex/statsd/framework/Android.bp b/apex/statsd/framework/Android.bp
index 5144590..43e762d0 100644
--- a/apex/statsd/framework/Android.bp
+++ b/apex/statsd/framework/Android.bp
@@ -30,6 +30,7 @@
     ],
     permitted_packages: [
         "android.app",
+        "android.os",
         "android.util",
     ],
     libs: [

apex/statsd/framework/java/android/os/StatsDimensionsValue.java

diff --git a/core/java/android/os/StatsDimensionsValue.java b/apex/statsd/framework/java/android/os/StatsDimensionsValue.java
similarity index 98%
rename from core/java/android/os/StatsDimensionsValue.java
rename to apex/statsd/framework/java/android/os/StatsDimensionsValue.java
index da13ea1..886130f 100644
--- a/core/java/android/os/StatsDimensionsValue.java
+++ b/apex/statsd/framework/java/android/os/StatsDimensionsValue.java
@@ -264,7 +264,8 @@
     /**
      * Parcelable Creator for StatsDimensionsValue.
      */
-    public static final @android.annotation.NonNull Parcelable.Creator<StatsDimensionsValue> CREATOR = new
+    public static final @android.annotation.NonNull
+            Parcelable.Creator<StatsDimensionsValue> CREATOR = new
             Parcelable.Creator<StatsDimensionsValue>() {
                 public StatsDimensionsValue createFromParcel(Parcel in) {
                     return new StatsDimensionsValue(in);