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

Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779

Browse Source 
* changes:
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting100MBDownload
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccounting
  fix com.android.server.net.NetworkStatsFactoryTest#testDoubleClatAccountingSimple
  fix android.net.NetworkStatsTest#testApply464xlatAdjustments
  NetworkStats - no need for xt_qtaguid clat bw fixups
This commit is contained in:
Maciej Żenczykowski
2020-05-28 09:04:42 +00:00
committed by Gerrit Code Review
parent f1b1600637 b053a337e3
commit 9fb791c62d
5 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/net/java/android/net/NetworkStatsTest.java
View File

@@ -909,8 +909,8 @@ public class NetworkStatsTest {
13805 /* txPackets */,
0 /* operations */);
// Traffic measured for the root uid on the base interface if eBPF is in use.
final NetworkStats.Entry ebpfRootUidEntry = new NetworkStats.Entry(
// Traffic measured for the root uid on the base interface.
final NetworkStats.Entry rootUidEntry = new NetworkStats.Entry(
baseIface, rootUid, SET_DEFAULT, TAG_NONE,
163577 /* rxBytes */,
187 /* rxPackets */,
@@ -918,17 +918,6 @@ public class NetworkStatsTest {
97 /* txPackets */,
0 /* operations */);
// Traffic measured for the root uid on the base interface if xt_qtaguid is in use.
// Incorrectly includes appEntry's bytes and packets, plus IPv4-IPv6 translation
// overhead (20 bytes per packet), in rx direction.
final NetworkStats.Entry xtRootUidEntry = new NetworkStats.Entry(
baseIface, rootUid, SET_DEFAULT, TAG_NONE,
31113087 /* rxBytes */,
22588 /* rxPackets */,
17607 /* txBytes */,
97 /* txPackets */,
0 /* operations */);
final NetworkStats.Entry otherEntry = new NetworkStats.Entry(
otherIface, appUid, SET_DEFAULT, TAG_NONE,
2600 /* rxBytes */,
@@ -939,12 +928,12 @@ public class NetworkStatsTest {
final NetworkStats statsXt = new NetworkStats(TEST_START, 3)
.insertEntry(appEntry)
.insertEntry(xtRootUidEntry)
.insertEntry(rootUidEntry)
.insertEntry(otherEntry);
final NetworkStats statsEbpf = new NetworkStats(TEST_START, 3)
.insertEntry(appEntry)
.insertEntry(ebpfRootUidEntry)
.insertEntry(rootUidEntry)
.insertEntry(otherEntry);
statsXt.apply464xlatAdjustments(stackedIface, false);