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

Merge changes I289d935f,I0121a4ac am: 84af34369d am: 843c1661c7

Browse Source 
Change-Id: If3c25f5a373e96fc007698ad2c5cdef5af92804a
This commit is contained in:
Treehugger Robot
2020-05-28 11:08:56 +00:00
committed by Automerger Merge Worker
parent d08aecf08f 843c1661c7
commit e48eec1903
3 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -926,21 +926,14 @@ public class NetworkStatsTest {
3 /* txPackets */,
0 /* operations */);
final NetworkStats statsXt = new NetworkStats(TEST_START, 3)
final NetworkStats stats = new NetworkStats(TEST_START, 3)
.insertEntry(appEntry)
.insertEntry(rootUidEntry)
.insertEntry(otherEntry);
final NetworkStats statsEbpf = new NetworkStats(TEST_START, 3)
.insertEntry(appEntry)
.insertEntry(rootUidEntry)
.insertEntry(otherEntry);
stats.apply464xlatAdjustments(stackedIface);
statsXt.apply464xlatAdjustments(stackedIface, false);
statsEbpf.apply464xlatAdjustments(stackedIface, true);
assertEquals(3, statsXt.size());
assertEquals(3, statsEbpf.size());
assertEquals(3, stats.size());
final NetworkStats.Entry expectedAppUid = new NetworkStats.Entry(
v4Iface, appUid, SET_DEFAULT, TAG_NONE,
30949510,
@@ -955,12 +948,9 @@ public class NetworkStatsTest {
17607,
97,
0);
assertEquals(expectedAppUid, statsXt.getValues(0, null));
assertEquals(expectedRootUid, statsXt.getValues(1, null));
assertEquals(otherEntry, statsXt.getValues(2, null));
assertEquals(expectedAppUid, statsEbpf.getValues(0, null));
assertEquals(expectedRootUid, statsEbpf.getValues(1, null));
assertEquals(otherEntry, statsEbpf.getValues(2, null));
assertEquals(expectedAppUid, stats.getValues(0, null));
assertEquals(expectedRootUid, stats.getValues(1, null));
assertEquals(otherEntry, stats.getValues(2, null));
}
@Test
@@ -985,7 +975,7 @@ public class NetworkStatsTest {
.insertEntry(secondEntry);
// Empty map: no adjustment
stats.apply464xlatAdjustments(new ArrayMap<>(), false);
stats.apply464xlatAdjustments(new ArrayMap<>());
assertEquals(2, stats.size());
assertEquals(firstEntry, stats.getValues(0, null));