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

Use java BpfMap in BpfNetMaps#removeNiceApp

Browse Source 
Bug: 217624062
Test: atest BpfNetMapsTest HostsideRestrictBackgroundNetworkTests
Change-Id: I0433459ec43b6a84c4417152884d10fae5fecee6
This commit is contained in:
Motomu Utsumi
2022-06-29 03:53:03 +00:00
parent 389278ec8b
commit 7392eb4f4c
2 changed files with 41 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

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

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

@@ -27,6 +27,7 @@ import static android.net.ConnectivityManager.FIREWALL_CHAIN_STANDBY;
import static android.net.INetd.PERMISSION_INTERNET; import static android.net.INetd.PERMISSION_INTERNET;
import static com.android.server.BpfNetMaps.DOZABLE_MATCH; import static com.android.server.BpfNetMaps.DOZABLE_MATCH;
import static com.android.server.BpfNetMaps.HAPPY_BOX_MATCH;
import static com.android.server.BpfNetMaps.IIF_MATCH; import static com.android.server.BpfNetMaps.IIF_MATCH;
import static com.android.server.BpfNetMaps.NO_MATCH; import static com.android.server.BpfNetMaps.NO_MATCH;
import static com.android.server.BpfNetMaps.PENALTY_BOX_MATCH; import static com.android.server.BpfNetMaps.PENALTY_BOX_MATCH;
@@ -332,4 +333,42 @@ public final class BpfNetMapsTest {
assertThrows(UnsupportedOperationException.class, assertThrows(UnsupportedOperationException.class,
() -> mBpfNetMaps.addNaughtyApp(TEST_UID)); () -> mBpfNetMaps.addNaughtyApp(TEST_UID));
} }
private void doTestRemoveNiceApp(final long iif, final long match) throws Exception {
mUidOwnerMap.updateEntry(new U32(TEST_UID), new UidOwnerValue(iif, match));
mBpfNetMaps.removeNiceApp(TEST_UID);
checkUidOwnerValue(TEST_UID, iif, match & ~HAPPY_BOX_MATCH);
}
@Test
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testRemoveNiceApp() throws Exception {
doTestRemoveNiceApp(NO_IIF, HAPPY_BOX_MATCH);
// HAPPY_BOX_MATCH with other matches
doTestRemoveNiceApp(NO_IIF, HAPPY_BOX_MATCH | DOZABLE_MATCH | POWERSAVE_MATCH);
// HAPPY_BOX_MATCH with IIF_MATCH
doTestRemoveNiceApp(TEST_IF_INDEX, HAPPY_BOX_MATCH | IIF_MATCH);
// HAPPY_BOX_MATCH is not enabled
doTestRemoveNiceApp(NO_IIF, DOZABLE_MATCH | POWERSAVE_MATCH | RESTRICTED_MATCH);
}
@Test
@IgnoreUpTo(Build.VERSION_CODES.S_V2)
public void testRemoveNiceAppMissingUid() {
// UidOwnerMap does not have entry for TEST_UID
assertThrows(ServiceSpecificException.class,
() -> mBpfNetMaps.removeNiceApp(TEST_UID));
}
@Test
@IgnoreAfter(Build.VERSION_CODES.S_V2)
public void testRemoveNiceAppBeforeT() {
assertThrows(UnsupportedOperationException.class,
() -> mBpfNetMaps.removeNiceApp(TEST_UID));
}
} }