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

DscpPolicy Move to kernel 5.15

Browse source 
Require at least kernel 5.15. Feature is not required on older
kernels and may impact boot time unnecessarily.

Bug: 235559605
BUg: 241077401
Fixes: 241077401
Test: run cts -m CtsNetTestCases -t android.net.cts.DscpPolicyTest
Change-Id: I2e4b509de1d8940fc63ae057a8326f13c0fd1420
Merged-In: I2e4b509de1d8940fc63ae057a8326f13c0fd1420
This commit is contained in:
Tyler Wear 2022-06-29 12:45:20 -07:00 • committed by Remi NGUYEN VAN
commit f8dbbdcb69
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/DscpPolicyTest.kt
View file

@ -136,8 +136,8 @@ class DscpPolicyTest {
@Before @Before
fun setUp() { fun setUp() {
// For BPF support kernel needs to be at least 5.4. // For BPF support kernel needs to be at least 5.15.
assumeTrue(kernelIsAtLeast(5, 4)) assumeTrue(kernelIsAtLeast(5, 15))
runAsShell(MANAGE_TEST_NETWORKS) { runAsShell(MANAGE_TEST_NETWORKS) {
val tnm = realContext.getSystemService(TestNetworkManager::class.java) val tnm = realContext.getSystemService(TestNetworkManager::class.java)
@ -158,7 +158,7 @@ class DscpPolicyTest {
@After @After
fun tearDown() { fun tearDown() {
if (!kernelIsAtLeast(5, 4)) { if (!kernelIsAtLeast(5, 15)) {
return; return;
} }
agentsToCleanUp.forEach { it.unregister() } agentsToCleanUp.forEach { it.unregister() }