From 790c02d70bc13d5214391e591c7abd53bc608e92 Mon Sep 17 00:00:00 2001 From: Junyu Lai Date: Mon, 27 Dec 2021 13:56:59 +0000 Subject: [PATCH] [MS21] Remove DataUnit dependency DataUnit is a hidden class, remove the references to it from files that about to be moved into the module. Test: TH Bug: 204830222 Change-Id: Ibfb82ab74f283686fb2af6c3a550d541440c890d --- .../src/android/app/usage/NetworkStatsManager.java | 3 +-- .../framework-t/src/android/net/TrafficStats.java | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java b/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java index ca83309216200..82c72ab1de7e3 100644 --- a/packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java +++ b/packages/ConnectivityT/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/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java b/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java index fa650617f3804..d8feb88f0fe46 100644 --- a/packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java +++ b/packages/ConnectivityT/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;