summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java6
-rw-r--r--hostsidetests/scopedstorage/redacturi/src/android/scopedstorage/cts/redacturi/RedactUriDeviceTest.java6
2 files changed, 10 insertions, 2 deletions
diff --git a/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java b/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java
index 4b17b65b93b..e2e640fa868 100644
--- a/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java
+++ b/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java
@@ -41,6 +41,8 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
import android.Manifest;
import android.content.ContentValues;
@@ -59,6 +61,7 @@ import android.system.Os;
import androidx.test.filters.SdkSuppress;
import com.android.cts.install.lib.TestApp;
+import com.android.modules.utils.build.SdkLevel;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -485,6 +488,7 @@ public class RedactUriDeviceTest extends ScopedStorageBaseDeviceTest {
@Test
public void testOpenOnRedactedUri_readFuzzer() throws Exception {
+ assumeTrue(SdkLevel.isAtLeastV());
final File img = stageFuzzerImageFileWithMetadata(FUZZER_HEIC_FILE_NAME);
final Uri redactedUri = getRedactedUri(img);
try {
@@ -591,4 +595,4 @@ public class RedactUriDeviceTest extends ScopedStorageBaseDeviceTest {
return img;
}
-} \ No newline at end of file
+}
diff --git a/hostsidetests/scopedstorage/redacturi/src/android/scopedstorage/cts/redacturi/RedactUriDeviceTest.java b/hostsidetests/scopedstorage/redacturi/src/android/scopedstorage/cts/redacturi/RedactUriDeviceTest.java
index b228dfe7e7b..ff8d505d65c 100644
--- a/hostsidetests/scopedstorage/redacturi/src/android/scopedstorage/cts/redacturi/RedactUriDeviceTest.java
+++ b/hostsidetests/scopedstorage/redacturi/src/android/scopedstorage/cts/redacturi/RedactUriDeviceTest.java
@@ -40,6 +40,8 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
import android.Manifest;
import android.content.ContentValues;
@@ -58,6 +60,7 @@ import android.system.Os;
import androidx.test.filters.SdkSuppress;
import com.android.cts.install.lib.TestApp;
+import com.android.modules.utils.build.SdkLevel;
import org.junit.AfterClass;
import org.junit.BeforeClass;
@@ -477,6 +480,7 @@ public class RedactUriDeviceTest extends ScopedStorageBaseDeviceTest {
@Test
public void testOpenOnRedactedUri_readFuzzer() throws Exception {
+ assumeTrue(SdkLevel.isAtLeastV());
final File img = stageFuzzerImageFileWithMetadata(FUZZER_HEIC_FILE_NAME);
final Uri redactedUri = getRedactedUri(img);
try {
@@ -583,4 +587,4 @@ public class RedactUriDeviceTest extends ScopedStorageBaseDeviceTest {
return img;
}
-} \ No newline at end of file
+}