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

Commit 241dde23 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Unify shorthand for byte-based units. 

Change-Id: If990859dee3f0973e1d4c48f05312c84071b3328
parent 1c9fcd90

core/java/android/net/TrafficStats.java

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,13 @@ public class TrafficStats { 
     */

    public final static int UNSUPPORTED = -1;



    /** @hide */

    public static final long KB_IN_BYTES = 1024;

    /** @hide */

    public static final long MB_IN_BYTES = KB_IN_BYTES * 1024;

    /** @hide */

    public static final long GB_IN_BYTES = MB_IN_BYTES * 1024;



    /**

     * Special UID value used when collecting {@link NetworkStatsHistory} for

     * removed applications.

core/tests/coretests/src/android/net/NetworkStatsHistoryTest.java

+2 −4
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import static android.net.NetworkStatsHistory.FIELD_TX_BYTES; 
import static android.net.NetworkStatsHistory.DataStreamUtils.readVarLong;

import static android.net.NetworkStatsHistory.DataStreamUtils.writeVarLong;

import static android.net.NetworkStatsHistory.Entry.UNKNOWN;

import static android.net.TrafficStats.GB_IN_BYTES;

import static android.net.TrafficStats.MB_IN_BYTES;

import static android.text.format.DateUtils.DAY_IN_MILLIS;

import static android.text.format.DateUtils.HOUR_IN_MILLIS;

import static android.text.format.DateUtils.MINUTE_IN_MILLIS;
@@ -50,10 +52,6 @@ public class NetworkStatsHistoryTest extends AndroidTestCase { 


    private static final long TEST_START = 1194220800000L;



    private static final long KB_IN_BYTES = 1024;

    private static final long MB_IN_BYTES = KB_IN_BYTES * 1024;

    private static final long GB_IN_BYTES = MB_IN_BYTES * 1024;



    private NetworkStatsHistory stats;



    @Override

services/java/com/android/server/net/NetworkPolicyManagerService.java

+1 −4
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ import static android.net.NetworkTemplate.MATCH_MOBILE_4G; 
import static android.net.NetworkTemplate.MATCH_MOBILE_ALL;

import static android.net.NetworkTemplate.MATCH_WIFI;

import static android.net.NetworkTemplate.buildTemplateMobileAll;

import static android.net.TrafficStats.MB_IN_BYTES;

import static android.text.format.DateUtils.DAY_IN_MILLIS;

import static com.android.internal.util.Preconditions.checkNotNull;

import static com.android.server.NetworkManagementService.LIMIT_GLOBAL_ALERT;
@@ -156,10 +157,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    private static final int VERSION_ADDED_METERED = 4;

    private static final int VERSION_SPLIT_SNOOZE = 5;



    private static final long KB_IN_BYTES = 1024;

    private static final long MB_IN_BYTES = KB_IN_BYTES * 1024;

    private static final long GB_IN_BYTES = MB_IN_BYTES * 1024;



    // @VisibleForTesting

    public static final int TYPE_WARNING = 0x1;

    public static final int TYPE_LIMIT = 0x2;

services/java/com/android/server/net/NetworkStatsService.java

+1 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import static android.net.NetworkStats.TAG_NONE; 
import static android.net.NetworkStats.UID_ALL;

import static android.net.NetworkTemplate.buildTemplateMobileAll;

import static android.net.NetworkTemplate.buildTemplateWifi;

import static android.net.TrafficStats.MB_IN_BYTES;

import static android.provider.Settings.Secure.NETSTATS_DEV_BUCKET_DURATION;

import static android.provider.Settings.Secure.NETSTATS_DEV_DELETE_AGE;

import static android.provider.Settings.Secure.NETSTATS_DEV_PERSIST_BYTES;
@@ -153,10 +154,6 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 


    private PendingIntent mPollIntent;



    private static final long KB_IN_BYTES = 1024;

    private static final long MB_IN_BYTES = 1024 * KB_IN_BYTES;

    private static final long GB_IN_BYTES = 1024 * MB_IN_BYTES;



    private static final String PREFIX_DEV = "dev";

    private static final String PREFIX_UID = "uid";

    private static final String PREFIX_UID_TAG = "uid_tag";

services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java

+2 −4
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL; 
import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;

import static android.net.NetworkPolicyManager.computeLastCycleBoundary;

import static android.net.NetworkPolicyManager.computeNextCycleBoundary;

import static android.net.TrafficStats.KB_IN_BYTES;

import static android.net.TrafficStats.MB_IN_BYTES;

import static android.text.format.DateUtils.DAY_IN_MILLIS;

import static android.text.format.DateUtils.MINUTE_IN_MILLIS;

import static com.android.server.net.NetworkPolicyManagerService.TYPE_LIMIT;
@@ -100,10 +102,6 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { 
    private static final long TEST_START = 1194220800000L;

    private static final String TEST_IFACE = "test0";



    private static final long KB_IN_BYTES = 1024;

    private static final long MB_IN_BYTES = KB_IN_BYTES * 1024;

    private static final long GB_IN_BYTES = MB_IN_BYTES * 1024;



    private static NetworkTemplate sTemplateWifi = NetworkTemplate.buildTemplateWifi();



    private BroadcastInterceptingContext mServiceContext;