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

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

Browse Source
This commit is contained in:
Chiachang Wang
2021-06-22 12:47:59 +00:00
committed by Gerrit Code Review
parent 9856889627 40803d4701
commit c0786a5ec8
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
staticlibs/testutils/Android.bp
View File

@@ -32,6 +32,7 @@ java_library {
"libnanohttpd", "libnanohttpd",
"net-tests-utils-host-device-common", "net-tests-utils-host-device-common",
"net-utils-device-common", "net-utils-device-common",
"modules-utils-build_system",
], ],
} }

4
staticlibs/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt
View File

@@ -26,6 +26,7 @@ import android.net.NetworkRequest
import android.net.TestNetworkInterface import android.net.TestNetworkInterface
import android.net.TestNetworkManager import android.net.TestNetworkManager
import android.os.Binder import android.os.Binder
import com.android.modules.utils.build.SdkLevel.isAtLeastS
import java.util.concurrent.CompletableFuture import java.util.concurrent.CompletableFuture
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@@ -39,7 +40,8 @@ import java.util.concurrent.TimeUnit
fun initTestNetwork(context: Context, interfaceAddr: LinkAddress, setupTimeoutMs: Long = 10_000L): fun initTestNetwork(context: Context, interfaceAddr: LinkAddress, setupTimeoutMs: Long = 10_000L):
TestNetworkTracker { TestNetworkTracker {
val tnm = context.getSystemService(TestNetworkManager::class.java) 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) return TestNetworkTracker(context, iface, tnm, setupTimeoutMs)
} }