commit b15bcea4d4c05f04212729ca7a4016269a5df1d4
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 27 02:30:25 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 27 02:30:25 2018 +0000
tree fe487bb7f568bcece18e9751aeda98365d39bb10
parent 855617501c4a8be95586962ce2612f493754e1f3
parent eb738c1c507ef9ad1ab78a238e10a05c729c0b0b

Merge "API council requested tweaks to DataUnit." into pi-dev

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 1eb25a4..7103928 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -45047,18 +45047,6 @@
     field public static final deprecated boolean RELEASE = true;
   }
 
-  public class DataUnit extends java.lang.Enum {
-    method public long toBytes(long);
-    method public static android.util.DataUnit valueOf(java.lang.String);
-    method public static final android.util.DataUnit[] values();
-    enum_constant public static final android.util.DataUnit GIBIBYTES;
-    enum_constant public static final android.util.DataUnit GIGABYTES;
-    enum_constant public static final android.util.DataUnit KIBIBYTES;
-    enum_constant public static final android.util.DataUnit KILOBYTES;
-    enum_constant public static final android.util.DataUnit MEBIBYTES;
-    enum_constant public static final android.util.DataUnit MEGABYTES;
-  }
-
   public class DebugUtils {
     method public static boolean isObjectSelected(java.lang.Object);
   }

core/java/android/util/DataUnit.java

diff --git a/core/java/android/util/DataUnit.java b/core/java/android/util/DataUnit.java
index ea4266e..cf045b8 100644
--- a/core/java/android/util/DataUnit.java
+++ b/core/java/android/util/DataUnit.java
@@ -29,6 +29,8 @@
  * "kibibyte" as an IEC unit of 1024 bytes.
  * <p>
  * This design is mirrored after {@link TimeUnit} and {@link ChronoUnit}.
+ *
+ * @hide
  */
 public enum DataUnit {
     KILOBYTES { @Override public long toBytes(long v) { return v * 1_000; } },