From 8742267b94d81107127a88de053c6bbdcd189d35 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Wed, 1 Jul 2020 13:57:56 +0000 Subject: [PATCH] Let testB141603906 run over ADB-over-network This test (added in R) failed to take the adb-over-network case into account like most other tests in the same file. As such it erroneously fails when tested over such a test setup. This patch exempts the shell from being subject to the VPN, like other similar tests do, to avoid the adb connections being killed. Test: VpnTest Bug: 159761399 Original-Change: https://android-review.googlesource.com/1349862 Merged-In: I0bc14d4d2cade7618c59b2cb88638bdf608d43d3 Change-Id: I0bc14d4d2cade7618c59b2cb88638bdf608d43d3 --- .../hostside/app/src/com/android/cts/net/hostside/VpnTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java index 26397ef5af..a451ea8585 100755 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java @@ -1016,7 +1016,8 @@ public class VpnTest extends InstrumentationTestCase { final Thread[] threads = new Thread[NUM_THREADS]; startVpn(new String[] {"192.0.2.2/32", "2001:db8:1:2::ffe/128"}, new String[] {"0.0.0.0/0", "::/0"}, - "", "", null, null /* underlyingNetworks */, false /* isAlwaysMetered */); + "" /* allowedApplications */, "com.android.shell" /* disallowedApplications */, + null /* proxyInfo */, null /* underlyingNetworks */, false /* isAlwaysMetered */); for (int i = 0; i < NUM_THREADS; i++) { threads[i] = new Thread(() -> {