Merge "Move fail in testFirewallBlocking" am: e74c7b6936

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2542990

Change-Id: Ib7acf7350b713809fc32b21fb42c04478ac1a4f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Motomu Utsumi
2023-04-19 04:05:52 +00:00
committed by Automerger Merge Worker

View File

@@ -3396,15 +3396,15 @@ public class ConnectivityManagerTest {
+ " uidFirewallRule=" + mCm.getUidFirewallRule(chain, Process.myUid()));
}
dstSock.receive(pkt);
assertArrayEquals(sendData, pkt.getData());
if (expectBlock) {
fail("Expect to be blocked by firewall but sending packet was not blocked:"
+ " chain=" + chain
+ " chainEnabled=" + mCm.getFirewallChainEnabled(chain)
+ " uidFirewallRule=" + mCm.getUidFirewallRule(chain, Process.myUid()));
}
dstSock.receive(pkt);
assertArrayEquals(sendData, pkt.getData());
}
private static final boolean EXPECT_PASS = false;