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

Commit c142e667 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[MS21] Remove DataUnit dependency" am: 4f4060c7 am: f5012d0c 

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

Change-Id: Ic3808c2bcd576ded8ab10f5d1e10865b1087e4a2
parents 24ed8100 f5012d0c

packages/ConnectivityT/framework-t/src/android/app/usage/NetworkStatsManager.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

packages/ConnectivityT/framework-t/src/android/net/TrafficStats.java

+5 −6
Original line number Diff line number Diff line
@@ -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;