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

Merge "Move current StatsMap dump to BpfNetMaps"

Browse Source
This commit is contained in:
Motomu Utsumi
2022-10-05 04:11:11 +00:00
committed by Gerrit Code Review
parent 2f17ade211 c675d6fc01
commit 1e003b4c9a
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/unit/java/com/android/server/BpfNetMapsTest.java
View File

@@ -146,6 +146,8 @@ public final class BpfNetMapsTest {
doReturn(0).when(mDeps).synchronizeKernelRCU();
BpfNetMaps.setEnableJavaBpfMapForTest(true /* enable */);
BpfNetMaps.setConfigurationMapForTest(mConfigurationMap);
mConfigurationMap.updateEntry(
CURRENT_STATS_MAP_CONFIGURATION_KEY, new U32(STATS_SELECT_MAP_A));
BpfNetMaps.setUidOwnerMapForTest(mUidOwnerMap);
BpfNetMaps.setUidPermissionMapForTest(mUidPermissionMap);
BpfNetMaps.setCookieTagMapForTest(mCookieTagMap);
@@ -1017,4 +1019,16 @@ public final class BpfNetMapsTest {
doTestDumpUidOwnerMap(DOZABLE_MATCH | invalid_match,
"DOZABLE_MATCH UNKNOWN_MATCH(" + invalid_match + ")");
}
@Test
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testDumpCurrentStatsMapConfig() throws Exception {
mConfigurationMap.updateEntry(
CURRENT_STATS_MAP_CONFIGURATION_KEY, new U32(STATS_SELECT_MAP_A));
assertDumpContains(getDump(), "current statsMap configuration: 0 SELECT_MAP_A");
mConfigurationMap.updateEntry(
CURRENT_STATS_MAP_CONFIGURATION_KEY, new U32(STATS_SELECT_MAP_B));
assertDumpContains(getDump(), "current statsMap configuration: 1 SELECT_MAP_B");
}
}