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

Wait for default route for wifi check

Browse source 
Instead of only waiting for an IPv6 address, wait for global IPv6
addresses to be routable.

This mirrors the check used for AI_ADDRCONFIG in DnsResolver. Without
this, the later call to network.getAllByName may only return IPv4
addresses if IPv6 global addresses are not reachable.

Test: atest
Change-Id: I2cedd58431eb8abeb5ffd9fb8daedb061586373b
This commit is contained in:
Remi NGUYEN VAN 2025-01-07 17:51:35 +09:00
commit ee21b71492
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
staticlibs/testutils/app/connectivitychecker/src/com/android/testutils/connectivitypreparer/ConnectivityCheckTest.kt
View file

@ -19,7 +19,7 @@ package com.android.testutils.connectivitypreparer
import android.Manifest.permission.NETWORK_SETTINGS
import android.content.pm.PackageManager.FEATURE_TELEPHONY
import android.content.pm.PackageManager.FEATURE_WIFI
import android.net.LinkAddress
import android.net.InetAddresses.parseNumericAddress
import android.net.Network
import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET
import android.net.NetworkCapabilities.TRANSPORT_WIFI
@ -66,7 +66,8 @@ class ConnectivityCheckTest {
// Skip IPv6 checks on virtual devices which do not support it. Tests that require IPv6 will
// still fail even if the preparer does not.
private fun ipv6Unsupported(wifiSsid: String?) = ConnectUtil.VIRTUAL_SSIDS.contains(
WifiInfo.sanitizeSsid(wifiSsid))
WifiInfo.sanitizeSsid(wifiSsid)
)
@Test
fun testCheckWifiSetup() {
@ -89,13 +90,25 @@ class ConnectivityCheckTest {
pos = 0,
timeoutMs = 30_000L
) {
it is LinkPropertiesChanged &&
it.network == network &&
it.lp.allLinkAddresses.any(LinkAddress::isIpv4) &&
(ipv6Unsupported(ssid) || it.lp.hasGlobalIpv6Address())
if (it !is LinkPropertiesChanged || it.network != network) {
false
} else {
// Same check as used by DnsResolver for AI_ADDRCONFIG (have_ipv4)
val ipv4Reachable = it.lp.isReachable(parseNumericAddress("8.8.8.8"))
// Same check as used by DnsResolver for AI_ADDRCONFIG (have_ipv6)
val ipv6Reachable = it.lp.isReachable(parseNumericAddress("2000::"))
ipv4Reachable && (ipv6Unsupported(ssid) || ipv6Reachable)
}
}
assertNotNull(lpChange, "Wifi network $network needs an IPv4 address" +
if (ipv6Unsupported(ssid)) "" else " and a global IPv6 address")
assertNotNull(
lpChange,
"Wifi network $network needs an IPv4 address and default route" +
if (ipv6Unsupported(ssid)) {
""
} else {
" and a global IPv6 address and default route"
}
)
Pair(network, ssid)
}