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 changes Iad43a122,Icdefa89f into main

Browse source 
* changes:
  Skip ApfIntegrationTest on automotive devices
  Enforce valid APF versions (0, 2, 3, 4, 6000, 6100)
This commit is contained in:
Yuyang Huang 2025-05-12 08:34:00 -07:00 • committed by Android (Google) Code Review
commit b2e2674a44
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -352,6 +352,10 @@ class ApfIntegrationTest {
isTvDeviceSupportFullNetworkingUnder2w()
)
// APF GMS-VSR requirements don't apply to automotive devices. There is no power benefit to
// running APF on automotive as the device has almost infinite battery power.
assumeFalse("Skip test: automotive device", pm.hasSystemFeature(FEATURE_AUTOMOTIVE))
networkCallback = TestableNetworkCallback()
cm.requestNetwork(
NetworkRequest.Builder()
@ -405,6 +409,8 @@ class ApfIntegrationTest {
)
@Test
fun testApfCapabilities() {
// If APF is supported, the version must be valid.
assertThat(caps.apfVersionSupported).isAnyOf(0, 2, 3, 4, 6000, 6100)
// APF became mandatory in Android 14 VSR.
val vsrApiLevel = getVsrApiLevel()
assume().that(vsrApiLevel).isAtLeast(34)