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

Commit d27a1725 authored by junyulai's avatar junyulai Committed by Junyu Lai
Browse files

[SP01] Add NetworkStats to system API 

In order to let external module report their network stats,
expose necessary APIs to construct NetworkStats object.

Test: atest FrameworksNetTests CtsUsageStatsTestCases
Test: m doc-comment-check-docs
Bug: 130855321
Change-Id: Id3ec8aaff3df67948c25eac2319a74cf33a27979
parent c7c465f4

api/system-current.txt

+27 −0
Original line number Diff line number Diff line
@@ -4443,6 +4443,33 @@ package android.net { 
    field public static final String PERMISSION_MAINLINE_NETWORK_STACK = "android.permission.MAINLINE_NETWORK_STACK";

  }













  public final class NetworkStats implements android.os.Parcelable {













    ctor public NetworkStats(long, int);













    method @NonNull public android.net.NetworkStats add(@NonNull android.net.NetworkStats);













    method @NonNull public android.net.NetworkStats addValues(@NonNull android.net.NetworkStats.Entry);













    method public int describeContents();













    method @NonNull public android.net.NetworkStats subtract(@NonNull android.net.NetworkStats);













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.NetworkStats> CREATOR;













    field public static final int DEFAULT_NETWORK_NO = 0; // 0x0













    field public static final int DEFAULT_NETWORK_YES = 1; // 0x1













    field @Nullable public static final String IFACE_ALL;













    field public static final String IFACE_VT = "vt_data0";













    field public static final int METERED_NO = 0; // 0x0













    field public static final int METERED_YES = 1; // 0x1













    field public static final int ROAMING_NO = 0; // 0x0













    field public static final int ROAMING_YES = 1; // 0x1













    field public static final int SET_DEFAULT = 0; // 0x0













    field public static final int SET_FOREGROUND = 1; // 0x1













    field public static final int TAG_NONE = 0; // 0x0













    field public static final int UID_ALL = -1; // 0xffffffff













    field public static final int UID_TETHERING = -5; // 0xfffffffb













  }

























  public static class NetworkStats.Entry {













    ctor public NetworkStats.Entry(@Nullable String, int, int, int, int, int, int, long, long, long, long, long);













  }



























  public final class RouteInfo implements android.os.Parcelable {















    ctor public RouteInfo(@Nullable android.net.IpPrefix, @Nullable java.net.InetAddress, @Nullable String, int);















    method public int getType();

































core/java/android/net/NetworkStats.java



+183
−36


























File changed.
Preview size limit exceeded, changes collapsed.
























core/java/android/net/TrafficStats.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -89,7 +89,7 @@ public class TrafficStats {













     *















     * @hide















     */













    public static final int UID_TETHERING = -5;













    public static final int UID_TETHERING = NetworkStats.UID_TETHERING;































    /**















     * Tag values in this range are reserved for the network stack. The network stack is

































core/tests/bandwidthtests/src/com/android/bandwidthtest/BandwidthTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -268,7 +268,7 @@ public class BandwidthTest extends InstrumentationTestCase {













        File snd_stat = new File (root_filepath + "tcp_snd");















        int tx = BandwidthTestUtil.parseIntValueFromFile(snd_stat);















        NetworkStats stats = new NetworkStats(SystemClock.elapsedRealtime(), 1);













        stats.addValues(NetworkStats.IFACE_ALL, uid, NetworkStats.SET_DEFAULT,













        stats.addEntry(NetworkStats.IFACE_ALL, uid, NetworkStats.SET_DEFAULT,















                NetworkStats.TAG_NONE, rx, 0, tx, 0, 0);















        return stats;















    }

































core/tests/benchmarks/src/android/net/NetworkStatsBenchmark.java



+2
−2




























Original line number
Diff line number
Diff line








@@ -54,7 +54,7 @@ public class NetworkStatsBenchmark {













            recycle.txBytes = 150000;















            recycle.txPackets = 1500;















            recycle.operations = 0;













            mNetworkStats.addValues(recycle);













            mNetworkStats.addEntry(recycle);















            if (recycle.set == 1) {















                uid++;















            }









@@ -70,7 +70,7 @@ public class NetworkStatsBenchmark {













            recycle.txBytes = 180000 * mSize;















            recycle.txPackets = 1200 * mSize;















            recycle.operations = 0;













            mNetworkStats.addValues(recycle);













            mNetworkStats.addEntry(recycle);















        }















    }