commit cede7e0e86fb12ad6d62f8a43e0f9b4165df6d2f
author Diksha Gohlyan <dikshag@google.com> Tue Mar 31 14:43:00 2020 -0700
committer Diksha Gohlyan <dikshag@google.com> Tue Mar 31 21:55:22 2020 +0000
tree 51f4a6dd2ddaa2802fa29095beaa9d355ee5da4e
parent 9469c1f208b50fa578d80313614b51411d29bedd

Run cts tests only in  > Q from when scoped storage is available

Test: atest DocumentsTest
Bug: 150904641
Change-Id: I50190e6b356240eafe5a67805343e58de47edf5f

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 00ddbb0..1c83284 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/DocumentsTest.java
@@ -100,7 +100,10 @@
     }
 
     public void testOpenDocumentTreeWithScopedStorage() throws Exception {
-        runDeviceTests(CLIENT_PKG, ".DocumentsClientTest", "testOpenDocumentTreeWithScopedStorage");
+        if (isAtLeastR()) {
+            runDeviceTests(CLIENT_PKG, ".DocumentsClientTest",
+                "testOpenDocumentTreeWithScopedStorage");
+        }
     }
 
     public void testOpenRootWithoutRootIdAtInitialLocation() throws Exception {
@@ -121,16 +124,33 @@
     }
 
     public void testRestrictStorageAccessFrameworkEnabled_blockFromTree() throws Exception {
-        runDeviceCompatTest(CLIENT_PKG, ".DocumentsClientTest",
+        if (isAtLeastR()) {
+            runDeviceCompatTest(CLIENT_PKG, ".DocumentsClientTest",
                 "testRestrictStorageAccessFrameworkEnabled_blockFromTree",
                 /* enabledChanges */ ImmutableSet.of(RESTRICT_STORAGE_ACCESS_FRAMEWORK),
                 /* disabledChanges */ ImmutableSet.of());
+        }
     }
 
     public void testRestrictStorageAccessFrameworkDisabled_notBlockFromTree() throws Exception {
-        runDeviceCompatTest(CLIENT_PKG, ".DocumentsClientTest",
+        if (isAtLeastR()) {
+            runDeviceCompatTest(CLIENT_PKG, ".DocumentsClientTest",
                 "testRestrictStorageAccessFrameworkDisabled_notBlockFromTree",
                 /* enabledChanges */ ImmutableSet.of(),
                 /* disabledChanges */ ImmutableSet.of(RESTRICT_STORAGE_ACCESS_FRAMEWORK));
+        }
+    }
+
+    private boolean isAtLeastR() {
+        try {
+            String apiString = getDevice().getProperty("ro.build.version.sdk");
+            if (apiString == null) {
+                return false;
+            }
+            int apiLevel = Integer.parseInt(apiString);
+            return apiLevel > 29;
+        } catch (Exception e) {
+            return false;
+        }
     }
 }