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

Commit da47ba18 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

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

am: 2b00e5c3

Change-Id: I14ae729a10b9f3d1e12ea3ada1fe69589d6c90e1
parents a1f04b92 2b00e5c3

api/current.txt

+0 −12
Original line number Diff line number Diff line
@@ -45047,18 +45047,6 @@ package android.util { 
    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



+2
−0




























Original line number
Diff line number
Diff line








@@ -29,6 +29,8 @@ import java.util.concurrent.TimeUnit;













 * "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; } },