diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-12-29 13:24:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-12-29 13:24:49 +0000 |
| commit | 1fb56a8f115fef9d23219d5c39c0289154b40717 (patch) | |
| tree | 950535bb8114dc3a3cdb077a5af96f147615a04a /framework-t/src | |
| parent | 94990d335e862348f8411bb44ea4d7f4969ea709 (diff) | |
| parent | 989b2128db294a79986860c91576e4e239985782 (diff) | |
Merge "[MS21] Remove DataUnit dependency"
Diffstat (limited to 'framework-t/src')
| -rw-r--r-- | framework-t/src/android/app/usage/NetworkStatsManager.java | 3 | ||||
| -rw-r--r-- | framework-t/src/android/net/TrafficStats.java | 11 |
2 files changed, 6 insertions, 8 deletions
diff --git a/framework-t/src/android/app/usage/NetworkStatsManager.java b/framework-t/src/android/app/usage/NetworkStatsManager.java index 2b9560e7ec..a316b8a617 100644 --- a/framework-t/src/android/app/usage/NetworkStatsManager.java +++ b/framework-t/src/android/app/usage/NetworkStatsManager.java @@ -47,7 +47,6 @@ import android.os.Messenger; import android.os.RemoteException; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.DataUnit; import android.util.Log; import com.android.internal.annotations.VisibleForTesting; @@ -119,7 +118,7 @@ public class NetworkStatsManager { * is reached. * @hide */ - public static final long MIN_THRESHOLD_BYTES = DataUnit.MEBIBYTES.toBytes(2); + public static final long MIN_THRESHOLD_BYTES = 2 * 1_048_576L; // 2MiB private final Context mContext; private final INetworkStatsService mService; diff --git a/framework-t/src/android/net/TrafficStats.java b/framework-t/src/android/net/TrafficStats.java index fa650617f3..d8feb88f0f 100644 --- a/framework-t/src/android/net/TrafficStats.java +++ b/framework-t/src/android/net/TrafficStats.java @@ -29,7 +29,6 @@ import android.media.MediaPlayer; import android.os.Build; import android.os.RemoteException; import android.os.ServiceManager; -import android.util.DataUnit; import com.android.server.NetworkManagementSocketTagger; @@ -59,19 +58,19 @@ public class TrafficStats { */ public final static int UNSUPPORTED = -1; - /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + /** @hide @deprecated use {@code DataUnit} instead to clarify SI-vs-IEC */ @Deprecated public static final long KB_IN_BYTES = 1024; - /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + /** @hide @deprecated use {@code DataUnit} instead to clarify SI-vs-IEC */ @Deprecated public static final long MB_IN_BYTES = KB_IN_BYTES * 1024; - /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + /** @hide @deprecated use {@code DataUnit} instead to clarify SI-vs-IEC */ @Deprecated public static final long GB_IN_BYTES = MB_IN_BYTES * 1024; - /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + /** @hide @deprecated use {@code DataUnit} instead to clarify SI-vs-IEC */ @Deprecated public static final long TB_IN_BYTES = GB_IN_BYTES * 1024; - /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */ + /** @hide @deprecated use {@code DataUnit} instead to clarify SI-vs-IEC */ @Deprecated public static final long PB_IN_BYTES = TB_IN_BYTES * 1024; |