commit c0786a5ec8be6f58559d63ca0df86c9d066f24e5
author Chiachang Wang <chiachangwang@google.com> Tue Jun 22 12:47:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 22 12:47:59 2021 +0000
tree ea7f7ed717db5bed0301197ea4aa76e4b6f088fa
parent 98568896279662b1b11ef5df2b579ca19741f52e
parent 40803d4701e2878e38907e81f6731e460be0c329

Merge "Add fall back to createTunInterface when running on R"

staticlibs/testutils/Android.bp

diff --git a/staticlibs/testutils/Android.bp b/staticlibs/testutils/Android.bp
index d4465dd..6d9414f 100644
--- a/staticlibs/testutils/Android.bp
+++ b/staticlibs/testutils/Android.bp
@@ -32,6 +32,7 @@
         "libnanohttpd",
         "net-tests-utils-host-device-common",
         "net-utils-device-common",
+        "modules-utils-build_system",
     ],
 }
 

staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt

diff --git a/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt b/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
index d8dd67a..36c09ce 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
@@ -26,6 +26,7 @@
 import android.net.TestNetworkInterface
 import android.net.TestNetworkManager
 import android.os.Binder
+import com.android.modules.utils.build.SdkLevel.isAtLeastS
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 
@@ -39,7 +40,8 @@
 fun initTestNetwork(context: Context, interfaceAddr: LinkAddress, setupTimeoutMs: Long = 10_000L):
         TestNetworkTracker {
     val tnm = context.getSystemService(TestNetworkManager::class.java)
-    val iface = tnm.createTunInterface(arrayOf(interfaceAddr))
+    val iface = if (isAtLeastS()) tnm.createTunInterface(listOf(interfaceAddr))
+            else tnm.createTunInterface(arrayOf(interfaceAddr))
     return TestNetworkTracker(context, iface, tnm, setupTimeoutMs)
 }