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

Merge "Revert "Prioritize non-slices over slices"" into main

Browse Source
This commit is contained in:
Jean Chalard
2023-11-24 02:50:35 +00:00
committed by Gerrit Code Review
parent e01fc685a2 6121a7656c
commit 11162e97c6
2 changed files with 2 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/unit/java/com/android/server/connectivity/NetworkRankerTest.kt
View File

@@ -18,12 +18,9 @@ package com.android.server.connectivity
import android.net.NetworkCapabilities
import android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL as NET_CAP_PORTAL
import android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET as NET_CAP_INTERNET
import android.net.NetworkCapabilities.NET_CAPABILITY_PRIORITIZE_BANDWIDTH as NET_CAP_PRIO_BW
import android.net.NetworkCapabilities.TRANSPORT_CELLULAR
import android.net.NetworkCapabilities.TRANSPORT_WIFI
import android.net.NetworkScore.KEEP_CONNECTED_NONE
import android.net.NetworkScore.POLICY_TRANSPORT_PRIMARY
import android.net.NetworkScore.POLICY_EXITING as EXITING
import android.net.NetworkScore.POLICY_TRANSPORT_PRIMARY as PRIMARY
import android.net.NetworkScore.POLICY_YIELD_TO_BAD_WIFI as YIELD_TO_BAD_WIFI
@@ -53,8 +50,8 @@ private fun caps(transport: Int, vararg capabilities: Int) =
class NetworkRankerTest(private val activelyPreferBadWifi: Boolean) {
private val mRanker = NetworkRanker(NetworkRanker.Configuration(activelyPreferBadWifi))
private class TestScore(private val sc: FullScore, private val nc: NetworkCapabilities) :
NetworkRanker.Scoreable {
private class TestScore(private val sc: FullScore, private val nc: NetworkCapabilities)
: NetworkRanker.Scoreable {
override fun getScore() = sc
override fun getCapsNoCopy(): NetworkCapabilities = nc
}
@@ -199,41 +196,4 @@ class NetworkRankerTest(private val activelyPreferBadWifi: Boolean) {
val badExitingWifi = TestScore(score(EVER_EVALUATED, EVER_VALIDATED, EXITING), CAPS_WIFI)
assertEquals(cell, rank(cell, badExitingWifi))
}
@Test
fun testValidatedPolicyStrongerThanSlice() {
val unvalidatedNonslice = TestScore(score(EVER_EVALUATED),
caps(TRANSPORT_CELLULAR, NET_CAP_INTERNET))
val slice = TestScore(score(EVER_EVALUATED, IS_VALIDATED),
caps(TRANSPORT_CELLULAR, NET_CAP_INTERNET, NET_CAP_PRIO_BW))
assertEquals(slice, rank(slice, unvalidatedNonslice))
}
@Test
fun testPrimaryPolicyStrongerThanSlice() {
val nonslice = TestScore(score(EVER_EVALUATED),
caps(TRANSPORT_CELLULAR, NET_CAP_INTERNET))
val primarySlice = TestScore(score(EVER_EVALUATED, POLICY_TRANSPORT_PRIMARY),
caps(TRANSPORT_CELLULAR, NET_CAP_INTERNET, NET_CAP_PRIO_BW))
assertEquals(primarySlice, rank(nonslice, primarySlice))
}
@Test
fun testPreferNonSlices() {
// Slices lose to non-slices for general ranking
val nonslice = TestScore(score(EVER_EVALUATED, IS_VALIDATED),
caps(TRANSPORT_CELLULAR, NET_CAP_INTERNET))
val slice = TestScore(score(EVER_EVALUATED, IS_VALIDATED),
caps(TRANSPORT_CELLULAR, NET_CAP_INTERNET, NET_CAP_PRIO_BW))
assertEquals(nonslice, rank(slice, nonslice))
}
@Test
fun testSlicePolicyStrongerThanTransport() {
val nonSliceCell = TestScore(score(EVER_EVALUATED, IS_VALIDATED),
caps(TRANSPORT_CELLULAR, NET_CAP_INTERNET))
val sliceWifi = TestScore(score(EVER_EVALUATED, IS_VALIDATED),
caps(TRANSPORT_WIFI, NET_CAP_INTERNET, NET_CAP_PRIO_BW))
assertEquals(nonSliceCell, rank(nonSliceCell, sliceWifi))
}
}