commit d0030fc967f08cc8a60485e62d2622982d6feef0
author Yuyang Huang <yuyanghuang@google.com> Mon May 12 21:40:00 2025 +0900
committer Yuyang Huang <yuyanghuang@google.com> Mon May 12 22:17:37 2025 +0900
tree 78ad980dec4cdcdf77d2d17551b7d0bfa9e51ef3
parent 8d7c927e6ad5c892d7974563fee3a490478c22e3

Skip APFv6 enforcement check on Wear OS devices in 25Q2

This commit adjusts the APFv6 enforcement logic to align with 25Q2
GMS-VSR and GTVS requirements. APFv6 is currently applicable only to
handheld and tablet devices (GMS-VSR) and TV devices (GTVS). For Wear OS
devices, APFv6 enforcement is deferred until specific requirements are
officially incorporated; thus, the enforcement check is skipped.

Bug: 415732337
Test: TH
Flag: EXEMPT bugfix
Change-Id: I838a96f3f214d8e46895484f836ade2588a335db

tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt

diff --git a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
index 3e35968..b4ad325 100644
--- a/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
+++ b/tests/cts/net/src/android/net/cts/ApfIntegrationTest.kt
@@ -22,6 +22,7 @@
 import android.Manifest.permission
 import android.content.pm.PackageManager.FEATURE_AUTOMOTIVE
 import android.content.pm.PackageManager.FEATURE_LEANBACK
+import android.content.pm.PackageManager.FEATURE_WATCH
 import android.content.pm.PackageManager.FEATURE_WIFI
 import android.net.ConnectivityManager
 import android.net.Network
@@ -390,6 +391,14 @@
         }
     }
 
+    private fun shouldEnforceApfV6Support(vsrApiLevel: Int): Boolean {
+        if (pm.hasSystemFeature(FEATURE_WATCH)) {
+            // Enforce APFv6 post VSR-16.
+            return vsrApiLevel > 202504
+        }
+        return vsrApiLevel >= 202504
+    }
+
     @VsrTest(
         requirements = ["VSR-5.3.12-001", "VSR-5.3.12-003", "VSR-5.3.12-004", "VSR-5.3.12-009",
             "VSR-5.3.12-012"]
@@ -431,7 +440,11 @@
         // - Note, the APF RAM requirement for APF version 6.1 will become 4000 bytes in Android 17
         //   with CHIPSETs that set ro.board.first_api_level or ro.board.api_level to 202604 or
         //   higher.
-        if (vsrApiLevel >= 202504) {
+        // Note: At 25Q2, GMS-VSR requirements related to APFv6 are only applicable to handheld
+        // and tablet devices. GTVS requirements related to APFv6 are only applicable to TV devices.
+        // For Wear OS devices, APFv6 will not be enforced until specific requirements for Wear OS
+        // are officially incorporated.
+        if (shouldEnforceApfV6Support(vsrApiLevel)) {
             assertThat(caps.apfVersionSupported).isAnyOf(6000, 6100)
             if (caps.apfVersionSupported == 6000) {
                 assertThat(caps.maximumApfProgramSize).isAtLeast(4000)