Ipsec: enable tests on 25Q2+
This change is in theory a no-op: - all 25Q2+ kernels should be 64-bit - all 5.10+ kernels should be 5.10.210+ or 5.15.149+. (this only leaves 5.4.x kernels) Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I0bedff990239c6cbf42a594aa0bb50f1ca89b3e8
This commit is contained in:
parent
f2ae113d53
commit
49429f348c
1 changed files with 2 additions and 0 deletions
|
|
@ -375,6 +375,7 @@ public class IpSecManagerTest extends IpSecBaseTest {
|
|||
}
|
||||
|
||||
private static boolean isIpv6UdpEncapSupportedByKernel() {
|
||||
if (SdkLevel.isAtLeastB() && isKernelVersionAtLeast("5.10.0")) return true;
|
||||
return isKernelVersionAtLeast("5.15.31")
|
||||
|| (isKernelVersionAtLeast("5.10.108") && !isKernelVersionAtLeast("5.15.0"));
|
||||
}
|
||||
|
|
@ -392,6 +393,7 @@ public class IpSecManagerTest extends IpSecBaseTest {
|
|||
|
||||
// TODO: b/319532485 Figure out whether to support x86_32
|
||||
private static boolean isRequestTransformStateSupportedByKernel() {
|
||||
if (SdkLevel.isAtLeastB()) return true;
|
||||
return NetworkUtils.isKernel64Bit() || !NetworkUtils.isKernelX86();
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue