LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[MS21] Remove DataUnit dependency" am: 1fb56a8f11 am: 2bee00d867

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933092

Change-Id: Ic3808c2bcd576ded8ab10f5d1e10865b1087e4a2
This commit is contained in:
Treehugger Robot
2021-12-29 14:05:02 +00:00
committed by Automerger Merge Worker
parent 4ec38f7922 2bee00d867
commit 6ee1a02d82
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework-t/src/android/app/usage/NetworkStatsManager.java
View File

@@ -47,7 +47,6 @@ import android.os.Messenger;
import android.os.RemoteException; import android.os.RemoteException;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.DataUnit;
import android.util.Log; import android.util.Log;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
@@ -119,7 +118,7 @@ public class NetworkStatsManager {
* is reached. * is reached.
* @hide * @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 Context mContext;
private final INetworkStatsService mService; private final INetworkStatsService mService;

11
framework-t/src/android/net/TrafficStats.java
View File

@@ -29,7 +29,6 @@ import android.media.MediaPlayer;
import android.os.Build; import android.os.Build;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.util.DataUnit;
import com.android.server.NetworkManagementSocketTagger; import com.android.server.NetworkManagementSocketTagger;
@@ -59,19 +58,19 @@ public class TrafficStats {
*/ */
public final static int UNSUPPORTED = -1; 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 @Deprecated
public static final long KB_IN_BYTES = 1024; 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 @Deprecated
public static final long MB_IN_BYTES = KB_IN_BYTES * 1024; 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 @Deprecated
public static final long GB_IN_BYTES = MB_IN_BYTES * 1024; 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 @Deprecated
public static final long TB_IN_BYTES = GB_IN_BYTES * 1024; 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 @Deprecated
public static final long PB_IN_BYTES = TB_IN_BYTES * 1024; public static final long PB_IN_BYTES = TB_IN_BYTES * 1024;