joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Add fall back to createTunInterface when running on R" am: 80ce99810c am: 682f69146a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1742033

Change-Id: I845db2f17d53fa6827224d4ffee2548dfce4fec5
This commit is contained in:
Chiachang Wang 2021-06-22 13:15:21 +00:00 • committed by Automerger Merge Worker
commit c26c836c02
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

@ -35,6 +35,7 @@ java_library {
"libnanohttpd",
"net-tests-utils-host-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.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 @@ import java.util.concurrent.TimeUnit
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)
}