Merge "Let testB141603906 run over ADB-over-network" am: 3cded8dc20 am: eb4d8b4fab

Original change: https://android-review.googlesource.com/c/platform/cts/+/1349862

Change-Id: Ie54c911ca55be520d20b582a67bb2bf36259b91c
This commit is contained in:
Chalard Jean
2020-07-01 13:57:56 +00:00
committed by Automerger Merge Worker

View File

@@ -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(() -> {