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 "Use FromS() on LocalNetworkConfig" into main

Browse source
This commit is contained in:
Jean Chalard 2023-11-16 04:45:15 +00:00 • committed by Gerrit Code Review
commit cc2e72735d
5 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tests/unit/java/com/android/server/connectivityservice/CSKeepConnectedTest.kt
View file

@ -47,8 +47,9 @@ class CSKeepConnectedTest : CSTest() {
val keepConnectedAgent = Agent(nc = nc, score = FromS(NetworkScore.Builder()
.setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK)
.build()),
lnc = LocalNetworkConfig.Builder().build())
val dontKeepConnectedAgent = Agent(nc = nc, lnc = LocalNetworkConfig.Builder().build())
lnc = FromS(LocalNetworkConfig.Builder().build()))
val dontKeepConnectedAgent = Agent(nc = nc,
lnc = FromS(LocalNetworkConfig.Builder().build()))
doTestKeepConnected(keepConnectedAgent, dontKeepConnectedAgent)
}

5
tests/unit/java/com/android/server/connectivityservice/CSLocalAgentCreationTests.kt
View file

@ -49,7 +49,7 @@ private const val NO_CALLBACK_TIMEOUT_MS = 200L
private fun keepConnectedScore() =
FromS(NetworkScore.Builder().setKeepConnectedReason(KEEP_CONNECTED_FOR_TEST).build())
private fun defaultLnc() = LocalNetworkConfig.Builder().build()
private fun defaultLnc() = FromS(LocalNetworkConfig.Builder().build())
@RunWith(DevSdkIgnoreRunner::class)
@SmallTest
@ -124,8 +124,7 @@ class CSLocalAgentCreationTests(
lnc = null)
}
assertFailsWith<IllegalArgumentException> {
Agent(nc = NetworkCapabilities.Builder().build(),
lnc = LocalNetworkConfig.Builder().build())
Agent(nc = NetworkCapabilities.Builder().build(), lnc = defaultLnc())
}
}
}

32
tests/unit/java/com/android/server/connectivityservice/CSLocalAgentTests.kt
View file

@ -94,7 +94,7 @@ class CSLocalAgentTests : CSTest() {
}
assertFailsWith<IllegalArgumentException> {
Agent(nc = NetworkCapabilities.Builder().build(),
lnc = LocalNetworkConfig.Builder().build())
lnc = FromS(LocalNetworkConfig.Builder().build()))
}
}
@ -110,7 +110,7 @@ class CSLocalAgentTests : CSTest() {
val agent = Agent(nc = NetworkCapabilities.Builder()
.addCapability(NET_CAPABILITY_LOCAL_NETWORK)
.build(),
lnc = LocalNetworkConfig.Builder().build())
lnc = FromS(LocalNetworkConfig.Builder().build()))
agent.connect()
cb.expectAvailableCallbacks(agent.network, validated = false)
agent.sendNetworkCapabilities(NetworkCapabilities.Builder().build())
@ -141,7 +141,7 @@ class CSLocalAgentTests : CSTest() {
val localAgent = Agent(
nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK),
lp = lp("local0"),
lnc = LocalNetworkConfig.Builder().build(),
lnc = FromS(LocalNetworkConfig.Builder().build()),
)
localAgent.connect()
@ -194,11 +194,11 @@ class CSLocalAgentTests : CSTest() {
// Set up a local agent that should forward its traffic to the best wifi upstream.
val localAgent = Agent(nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK),
lp = lp("local0"),
lnc = LocalNetworkConfig.Builder()
lnc = FromS(LocalNetworkConfig.Builder()
.setUpstreamSelector(NetworkRequest.Builder()
.addTransportType(TRANSPORT_WIFI)
.build())
.build(),
.build()),
score = FromS(NetworkScore.Builder()
.setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK)
.build())
@ -247,11 +247,11 @@ class CSLocalAgentTests : CSTest() {
// Set up a local agent that should forward its traffic to the best wifi upstream.
val localAgent = Agent(nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK),
lp = lp("local0"),
lnc = LocalNetworkConfig.Builder()
lnc = FromS(LocalNetworkConfig.Builder()
.setUpstreamSelector(NetworkRequest.Builder()
.addTransportType(TRANSPORT_WIFI)
.build())
.build(),
.build()),
score = FromS(NetworkScore.Builder()
.setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK)
.build())
@ -293,11 +293,11 @@ class CSLocalAgentTests : CSTest() {
cm.registerNetworkCallback(NetworkRequest.Builder().clearCapabilities().build(), cb)
val localNc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK)
val lnc = LocalNetworkConfig.Builder()
val lnc = FromS(LocalNetworkConfig.Builder()
.setUpstreamSelector(NetworkRequest.Builder()
.addTransportType(TRANSPORT_WIFI)
.build())
.build()
.build())
val localScore = FromS(NetworkScore.Builder().build())
// Set up a local agent that should forward its traffic to the best wifi upstream.
@ -346,11 +346,11 @@ class CSLocalAgentTests : CSTest() {
wifiAgent.unregisterAfterReplacement(LONG_TIMEOUT_MS)
val localAgent = Agent(nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK),
lp = lp("local0"),
lnc = LocalNetworkConfig.Builder()
lnc = FromS(LocalNetworkConfig.Builder()
.setUpstreamSelector(NetworkRequest.Builder()
.addTransportType(TRANSPORT_WIFI)
.build())
.build(),
.build()),
score = FromS(NetworkScore.Builder()
.setKeepConnectedReason(KEEP_CONNECTED_LOCAL_NETWORK)
.build())
@ -374,11 +374,11 @@ class CSLocalAgentTests : CSTest() {
fun testForwardingRules() {
deps.setBuildSdk(VERSION_V)
// Set up a local agent that should forward its traffic to the best DUN upstream.
val lnc = LocalNetworkConfig.Builder()
val lnc = FromS(LocalNetworkConfig.Builder()
.setUpstreamSelector(NetworkRequest.Builder()
.addCapability(NET_CAPABILITY_DUN)
.build())
.build()
.build())
val localAgent = Agent(nc = nc(TRANSPORT_WIFI, NET_CAPABILITY_LOCAL_NETWORK),
lp = lp("local0"),
lnc = lnc,
@ -426,7 +426,7 @@ class CSLocalAgentTests : CSTest() {
// Make sure sending the same config again doesn't do anything
repeat(5) {
localAgent.sendLocalNetworkConfig(lnc)
localAgent.sendLocalNetworkConfig(lnc.value)
}
inOrder.verifyNoMoreInteractions()
@ -501,13 +501,13 @@ class CSLocalAgentTests : CSTest() {
}
// Set up a local agent.
val lnc = LocalNetworkConfig.Builder().apply {
val lnc = FromS(LocalNetworkConfig.Builder().apply {
if (haveUpstream) {
setUpstreamSelector(NetworkRequest.Builder()
.addTransportType(TRANSPORT_WIFI)
.build())
}
}.build()
}.build())
val localAgent = Agent(nc = nc(TRANSPORT_THREAD, NET_CAPABILITY_LOCAL_NETWORK),
lp = lp("local0"),
lnc = lnc,

4
tests/unit/java/com/android/server/connectivityservice/base/CSAgentWrapper.kt
View file

@ -69,7 +69,7 @@ class CSAgentWrapper(
nac: NetworkAgentConfig,
val nc: NetworkCapabilities,
val lp: LinkProperties,
val lnc: LocalNetworkConfig?,
val lnc: FromS<LocalNetworkConfig>?,
val score: FromS<NetworkScore>,
val provider: NetworkProvider?
) : TestableNetworkCallback.HasNetwork {
@ -101,7 +101,7 @@ class CSAgentWrapper(
// Create the actual agent. NetworkAgent is abstract, so make an anonymous subclass.
if (deps.isAtLeastS()) {
agent = object : NetworkAgent(context, csHandlerThread.looper, TAG,
nc, lp, lnc, score.value, nac, provider) {}
nc, lp, lnc?.value, score.value, nac, provider) {}
} else {
agent = object : NetworkAgent(context, csHandlerThread.looper, TAG,
nc, lp, 50 /* score */, nac, provider) {}

2
tests/unit/java/com/android/server/connectivityservice/base/CSTest.kt
View file

@ -321,7 +321,7 @@ open class CSTest {
nc: NetworkCapabilities = defaultNc(),
nac: NetworkAgentConfig = emptyAgentConfig(nc.getLegacyType()),
lp: LinkProperties = defaultLp(),
lnc: LocalNetworkConfig? = null,
lnc: FromS<LocalNetworkConfig>? = null,
score: FromS<NetworkScore> = defaultScore(),
provider: NetworkProvider? = null
) = CSAgentWrapper(context, deps, csHandlerThread, networkStack,