commit 7ddf2fa0baa99ebd6e364bca90de244a77e292fb
author Yeabkal Wubshit <yeabkal@google.com> Tue Jul 02 06:15:48 2024 +0000
committer Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue Jul 02 06:15:48 2024 +0000
tree 61e117cec51d0159f5ef67a58ca9404050366335
parent 318114194d79b229a3584559179e136ed11ead84

Skip Microdroid VSR tests on Wear

VSR currently does not apply to Wear devices, so we're skipping VSR
tests in microdroid.

Bug: 349036120
Flag: TEST_ONLY
Test: atest MicrodroidCapabilitiesTest#avfIsRequired
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:10acca64298c328fdf2724645e93b4e5ac80db7d)
Merged-In: I8cace9aa4c66a3a43bf63bad09f5652f28710e3a
Change-Id: I8cace9aa4c66a3a43bf63bad09f5652f28710e3a

tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java

diff --git a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
index 026cf3f..b73ea24 100644
--- a/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
+++ b/tests/helper/src/java/com/android/microdroid/test/device/MicrodroidDeviceTestBase.java
@@ -16,6 +16,7 @@
 package com.android.microdroid.test.device;
 
 import static android.content.pm.PackageManager.FEATURE_VIRTUALIZATION_FRAMEWORK;
+import static android.content.pm.PackageManager.FEATURE_WATCH;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.TruthJUnit.assume;
@@ -222,6 +223,12 @@
                 .isFalse();
     }
 
+    protected void assumeVsrCompliant() {
+        assume().withMessage("Watches are not VSR compliant")
+                .that(mCtx.getPackageManager().hasSystemFeature(FEATURE_WATCH))
+                .isFalse();
+    }
+
     protected boolean isGsi() {
         return new File("/system/system_ext/etc/init/init.gsi.rc").exists();
     }

tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java

diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java
index 3b755a0..08bc310 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidCapabilitiesTest.java
@@ -63,6 +63,7 @@
     @Test
     @VsrTest(requirements = "VSR-7.1-001.005")
     public void avfIsRequired() {
+        assumeVsrCompliant();
         assume().withMessage("Requirement doesn't apply due to vendor API level")
                 .that(getVendorApiLevel())
                 .isAtLeast(202404);

tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java

diff --git a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
index c94f171..fd67659 100644
--- a/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
+++ b/tests/testapk/src/java/com/android/microdroid/test/MicrodroidTests.java
@@ -2288,6 +2288,7 @@
     @Test
     @VsrTest(requirements = {"VSR-7.1-001.003"})
     public void kernelVersionRequirement() throws Exception {
+        assumeVsrCompliant();
         int firstApiLevel = SystemProperties.getInt("ro.product.first_api_level", 0);
         assume().withMessage("Skip on devices launched before Android 14 (API level 34)")
                 .that(firstApiLevel)