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

Merge changes from topics "enable-policy-ranking", "sendNetworkScore" am: 5b15e700bb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1726731

Change-Id: I0f4598c353cb7dba7f0583a3103481d298e45b5c
This commit is contained in:
Junyu Lai
2021-06-08 23:10:17 +00:00
committed by Automerger Merge Worker
parent 50c26d75f0 5b15e700bb
commit 9575dbbb81
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
View File

@@ -546,16 +546,23 @@ class NetworkAgentTest {
// Connect the first Network // Connect the first Network
createConnectedNetworkAgent(name = name1).let { (agent1, _) -> createConnectedNetworkAgent(name = name1).let { (agent1, _) ->
callback.expectAvailableThenValidatedCallbacks(agent1.network) callback.expectAvailableThenValidatedCallbacks(agent1.network)
// Upgrade agent1 to a better score so that there is no ambiguity when // If using the int ranking, agent1 must be upgraded to a better score so that there is
// agent2 connects that agent1 is still better // no ambiguity when agent2 connects that agent1 is still better. If using policy
agent1.sendNetworkScore(BETTER_NETWORK_SCORE - 1) // ranking, this is not necessary.
agent1.sendNetworkScore(NetworkScore.Builder().setLegacyInt(BETTER_NETWORK_SCORE)
.build())
// Connect the second agent // Connect the second agent
createConnectedNetworkAgent(name = name2).let { (agent2, _) -> createConnectedNetworkAgent(name = name2).let { (agent2, _) ->
agent2.markConnected() agent2.markConnected()
// The callback should not see anything yet // The callback should not see anything yet. With int ranking, agent1 was upgraded
// to a stronger score beforehand. With policy ranking, agent1 is preferred by
// virtue of already satisfying the request.
callback.assertNoCallback(NO_CALLBACK_TIMEOUT) callback.assertNoCallback(NO_CALLBACK_TIMEOUT)
// Now update the score and expect the callback now prefers agent2 // Now downgrade the score and expect the callback now prefers agent2
agent2.sendNetworkScore(BETTER_NETWORK_SCORE) agent1.sendNetworkScore(NetworkScore.Builder()
.setLegacyInt(WORSE_NETWORK_SCORE)
.setExiting(true)
.build())
callback.expectCallback<Available>(agent2.network) callback.expectCallback<Available>(agent2.network)
} }
} }