commit d074c9ea585df21b78925f917e03a4278d7c850a
author Chiachang Wang <chiachangwang@google.com> Wed Oct 07 00:50:36 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Oct 07 00:50:36 2020 +0000
tree 3df31da96c2b8240366a2d4304169d3497acb603
parent 7ba787cc83c80c83690a246a33e00d1dbc5aca0b
parent b40f760f8dd8b21432ac8cb9aef78444e763583a

Merge "Don't wait for unnecessary disconnect broadcast"

tests/cts/hostside/app/src/com/android/cts/net/hostside/VpnTest.java

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 57e6b36..81a431c 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
@@ -1023,6 +1023,9 @@
     }
 
     public void testB141603906() throws Exception {
+        if (!supportedHardware()) {
+            return;
+        }
         final InetSocketAddress src = new InetSocketAddress(0);
         final InetSocketAddress dst = new InetSocketAddress(0);
         final int NUM_THREADS = 8;

tests/cts/net/TEST_MAPPING

diff --git a/tests/cts/net/TEST_MAPPING b/tests/cts/net/TEST_MAPPING
index 3162e22..9167c98 100644
--- a/tests/cts/net/TEST_MAPPING
+++ b/tests/cts/net/TEST_MAPPING
@@ -1,6 +1,6 @@
 {
   // TODO: move to mainline-presubmit once supported
-  "postsubmit": [
+  "presubmit": [
     {
       "name": "CtsNetTestCasesLatestSdk",
       "options": [