From a6886af4817b841ecde36d6d5f91624b0ea1c98d Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Sun, 7 Jan 2018 16:47:31 -0700 Subject: [PATCH] Add DataUnit to clarify SI-vs-IEC units. Mirrors the design of TimeUnit and ChronoUnit which many developers are already familiar with, making it easy to pick up and use. Yes, this is an enum. Bug: 70915728 Test: bit FrameworksCoreTests:android.util.DataUnitTest Change-Id: Id0cfdac5c81ed89c3c9ece23c964acba4a4f8471 --- core/java/android/net/TrafficStats.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index 196a3bc9c8..bda720bb6f 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -27,6 +27,7 @@ import android.content.Context; import android.media.MediaPlayer; import android.os.RemoteException; import android.os.ServiceManager; +import android.util.DataUnit; import com.android.server.NetworkManagementSocketTagger; @@ -56,15 +57,20 @@ public class TrafficStats { */ public final static int UNSUPPORTED = -1; - /** @hide */ + /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + @Deprecated public static final long KB_IN_BYTES = 1024; - /** @hide */ + /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + @Deprecated public static final long MB_IN_BYTES = KB_IN_BYTES * 1024; - /** @hide */ + /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + @Deprecated public static final long GB_IN_BYTES = MB_IN_BYTES * 1024; - /** @hide */ + /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + @Deprecated public static final long TB_IN_BYTES = GB_IN_BYTES * 1024; - /** @hide */ + /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + @Deprecated public static final long PB_IN_BYTES = TB_IN_BYTES * 1024; /**