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

Use java BpfMap in BpfNetMaps#addNiceApp

Browse Source 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideRestrictBackgroundNetworkTests
Change-Id: I32299ce8cde34d46999ecb966c3305c966c0509f
This commit is contained in:
Motomu Utsumi
2022-06-29 07:46:52 +00:00
parent 7392eb4f4c
commit 55630d0dc8
2 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
service/src/com/android/server/BpfNetMaps.java
View File

@@ -294,10 +294,8 @@ public class BpfNetMaps {
* cause of the failure.
*/
public void addNiceApp(final int uid) {
synchronized (sUidOwnerMap) {
final int err = native_addNiceApp(uid);
maybeThrow(err, "Unable to add nice app");
}
throwIfPreT("addNiceApp is not available on pre-T devices");
addRule(uid, HAPPY_BOX_MATCH, "addNiceApp");
}
/**

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

@@ -371,4 +371,36 @@ public final class BpfNetMapsTest {
assertThrows(UnsupportedOperationException.class,
() -> mBpfNetMaps.removeNiceApp(TEST_UID));
}
private void doTestAddNiceApp(final long iif, final long match) throws Exception {
if (match != NO_MATCH) {
mUidOwnerMap.updateEntry(new U32(TEST_UID), new UidOwnerValue(iif, match));
}
mBpfNetMaps.addNiceApp(TEST_UID);
checkUidOwnerValue(TEST_UID, iif, match | HAPPY_BOX_MATCH);
}
@Test
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testAddNiceApp() throws Exception {
doTestAddNiceApp(NO_IIF, NO_MATCH);
// Other matches are enabled
doTestAddNiceApp(NO_IIF, DOZABLE_MATCH | POWERSAVE_MATCH | RESTRICTED_MATCH);
// IIF_MATCH is enabled
doTestAddNiceApp(TEST_IF_INDEX, IIF_MATCH);
// HAPPY_BOX_MATCH is already enabled
doTestAddNiceApp(NO_IIF, HAPPY_BOX_MATCH | DOZABLE_MATCH);
}
@Test
@IgnoreAfter(Build.VERSION_CODES.S_V2)
public void testAddNiceAppBeforeT() {
assertThrows(UnsupportedOperationException.class,
() -> mBpfNetMaps.addNiceApp(TEST_UID));
}
}