joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix setDelegateUid unit test.

Browse source 
The assertion that the app was removed from the list was due to
the fact that when adding the same UID twice, the code first
removes it and then re-adds it.

Add a bit more test coverage.

Test: test-only change
Flag: EXEMPT TEST_ONLY
Change-Id: I1eda5be93668ebda7fe2049a2d1ace4e744948e7
This commit is contained in:
Lorenzo Colitti 2025-09-05 19:08:36 +09:00
commit fb3a754f83
1 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

39
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View file

@ -5086,24 +5086,49 @@ public class ConnectivityServiceTest {
final CaptivePortal captivePortal = signInIntent
.getParcelableExtra(ConnectivityManager.EXTRA_CAPTIVE_PORTAL);
InOrder inOrder = inOrder(mMockNetd);
// Add the UID and check that it's added to the bypass list.
FakeOutcomeReceiver or = new FakeOutcomeReceiver();
captivePortal.setDelegateUid(APP2_UID, r -> r.run(), or);
or.awaitOutcome();
verify(mMockNetd).networkAllowBypassVpnOnNetwork(true, APP2_UID,
inOrder.verify(mMockNetd).networkAllowBypassVpnOnNetwork(true, APP2_UID,
mWiFiAgent.getNetwork().netId);
// Remove the UID and check that it's removed from the list.
or = new FakeOutcomeReceiver();
captivePortal.setDelegateUid(Process.INVALID_UID, r -> r.run(), or);
or.awaitOutcome();
inOrder.verify(mMockNetd).networkAllowBypassVpnOnNetwork(false, APP2_UID,
mWiFiAgent.getNetwork().netId);
// Add the UID again.
or = new FakeOutcomeReceiver();
captivePortal.setDelegateUid(APP2_UID, r -> r.run(), or);
or.awaitOutcome();
verify(mMockNetd).networkAllowBypassVpnOnNetwork(false, APP2_UID,
inOrder.verify(mMockNetd).networkAllowBypassVpnOnNetwork(true, APP2_UID,
mWiFiAgent.getNetwork().netId);
// Add the UID again. Nothing should change.
or = new FakeOutcomeReceiver();
captivePortal.setDelegateUid(APP2_UID, r -> r.run(), or);
or.awaitOutcome();
// BUG: the code should not call into netd.
inOrder.verify(mMockNetd).networkAllowBypassVpnOnNetwork(false, APP2_UID,
mWiFiAgent.getNetwork().netId);
inOrder.verify(mMockNetd).networkAllowBypassVpnOnNetwork(true, APP2_UID,
mWiFiAgent.getNetwork().netId);
// Add another UID again. The old UID should be removed and the new one added.
or = new FakeOutcomeReceiver();
captivePortal.setDelegateUid(APP1_UID, r -> r.run(), or);
or.awaitOutcome();
inOrder.verify(mMockNetd).networkAllowBypassVpnOnNetwork(false, APP2_UID,
mWiFiAgent.getNetwork().netId);
inOrder.verify(mMockNetd).networkAllowBypassVpnOnNetwork(true, APP1_UID,
mWiFiAgent.getNetwork().netId);
mWiFiAgent.disconnect();
waitForIdle();
// TODO: test that if the network disconnects, the delegated UID is gone.
verify(mMockNetd).networkAllowBypassVpnOnNetwork(false, APP2_UID,
mWiFiAgent.getNetwork().netId);
// TODO: check VPN interface filtering rules, see
// testFullyRoutedVpnResultsInInterfaceFilteringRules