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

Merge "Add uid to the failure log of testFirewallBlocking" am: b93f1e7486

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

Change-Id: I5bc9a3a0297c7fa74ce45873762476d60021773e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Maciej Żenczykowski
2023-06-15 01:41:26 +00:00
committed by Automerger Merge Worker
parent 499f62be12 b93f1e7486
commit 0be6d8bf3b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -3410,6 +3410,7 @@ public class ConnectivityManagerTest {
private void checkFirewallBlocking(final DatagramSocket srcSock, final DatagramSocket dstSock, private void checkFirewallBlocking(final DatagramSocket srcSock, final DatagramSocket dstSock,
final boolean expectBlock, final int chain) throws Exception { final boolean expectBlock, final int chain) throws Exception {
final int uid = Process.myUid();
final Random random = new Random(); final Random random = new Random();
final byte[] sendData = new byte[100]; final byte[] sendData = new byte[100];
random.nextBytes(sendData); random.nextBytes(sendData);
@@ -3425,7 +3426,8 @@ public class ConnectivityManagerTest {
fail("Expect not to be blocked by firewall but sending packet was blocked:" fail("Expect not to be blocked by firewall but sending packet was blocked:"
+ " chain=" + chain + " chain=" + chain
+ " chainEnabled=" + mCm.getFirewallChainEnabled(chain) + " chainEnabled=" + mCm.getFirewallChainEnabled(chain)
+ " uidFirewallRule=" + mCm.getUidFirewallRule(chain, Process.myUid())); + " uid=" + uid
+ " uidFirewallRule=" + mCm.getUidFirewallRule(chain, uid));
} }
dstSock.receive(pkt); dstSock.receive(pkt);
@@ -3435,7 +3437,8 @@ public class ConnectivityManagerTest {
fail("Expect to be blocked by firewall but sending packet was not blocked:" fail("Expect to be blocked by firewall but sending packet was not blocked:"
+ " chain=" + chain + " chain=" + chain
+ " chainEnabled=" + mCm.getFirewallChainEnabled(chain) + " chainEnabled=" + mCm.getFirewallChainEnabled(chain)
+ " uidFirewallRule=" + mCm.getUidFirewallRule(chain, Process.myUid())); + " uid=" + uid
+ " uidFirewallRule=" + mCm.getUidFirewallRule(chain, uid));
} }
} }