commit 9447ffc1adff461d0f7bc12113d76cc75fde3389
author Robin Lee <rgl@google.com> Tue Jun 23 00:34:21 2020 +0200
committer Robin Lee <rgl@google.com> Tue Jun 23 00:38:41 2020 +0200
tree d163016bdb36fd02f562fe00f4a4d91ee12e6e16
parent 2e6fa4e30e38a266385ca82197ef663d387fb5bf

Move two DocumentsTest form factor checks to host

Device-side tests were attempting to skip themselves but some of
the test runners do additional processing after the end of the
test. We need to propagate the assumption violated exception up
to let the test know to exit early.

This is used by TV, Auto, and Wear targets to gate the tests for
some DocumentsUI-related bits of CTS.

Test: atest android.appsecurity.cts.DocumentsTest
Bug: 158034056
Change-Id: I0fe2871a54e8c74769b7feba47f7142f13b8b63e

hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java

diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java
index 1c83284..fc63925 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java
@@ -18,6 +18,8 @@
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 
+import com.android.tradefed.device.DeviceNotAvailableException;
+
 import com.google.common.collect.ImmutableSet;
 
 /**
@@ -124,7 +126,7 @@
     }
 
     public void testRestrictStorageAccessFrameworkEnabled_blockFromTree() throws Exception {
-        if (isAtLeastR()) {
+        if (isAtLeastR() && isSupportedHardware()) {
             runDeviceCompatTest(CLIENT_PKG, ".DocumentsClientTest",
                 "testRestrictStorageAccessFrameworkEnabled_blockFromTree",
                 /* enabledChanges */ ImmutableSet.of(RESTRICT_STORAGE_ACCESS_FRAMEWORK),
@@ -133,7 +135,7 @@
     }
 
     public void testRestrictStorageAccessFrameworkDisabled_notBlockFromTree() throws Exception {
-        if (isAtLeastR()) {
+        if (isAtLeastR() && isSupportedHardware()) {
             runDeviceCompatTest(CLIENT_PKG, ".DocumentsClientTest",
                 "testRestrictStorageAccessFrameworkDisabled_notBlockFromTree",
                 /* enabledChanges */ ImmutableSet.of(),
@@ -153,4 +155,17 @@
             return false;
         }
     }
+
+    private boolean isSupportedHardware() {
+        try {
+            if (getDevice().hasFeature("feature:android.hardware.type.television")
+                    || getDevice().hasFeature("feature:android.hardware.type.watch")
+                    || getDevice().hasFeature("feature:android.hardware.type.automotive")) {
+                return false;
+            }
+        } catch (DeviceNotAvailableException e) {
+            return true;
+        }
+        return true;
+    }
 }