commit 1ef46fce0c6649c8cbe1f12b4a49712715edc994
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Aug 20 23:34:09 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 20 23:34:09 2021 +0000
tree bdf3c2f09a92fba25511a95253876015a79ab1a8
parent ff2d386955356e1a48cb3d5d825651ceb32c1f2b
parent d1f52fb03b87534ac2ee65353b37cd651f4c1f9b

Merge "Exclude slices-disabled devices from SlicesProviderTest" into qt-dev am: 069ccd1993 am: a652592bce am: d1f52fb03b

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/14311329

Change-Id: I9d35d891794023616d11c61ee7980adb2f37b64b

tests/tests/slice/src/android/slice/cts/SliceProviderTest.java

diff --git a/tests/tests/slice/src/android/slice/cts/SliceProviderTest.java b/tests/tests/slice/src/android/slice/cts/SliceProviderTest.java
index 2a2e8e4..cf7f61c 100644
--- a/tests/tests/slice/src/android/slice/cts/SliceProviderTest.java
+++ b/tests/tests/slice/src/android/slice/cts/SliceProviderTest.java
@@ -16,9 +16,12 @@
 
 package android.slice.cts;
 
+import static org.junit.Assume.assumeFalse;
+
 import android.app.slice.Slice;
 import android.app.slice.SliceSpec;
 import android.content.ContentResolver;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 
@@ -52,19 +55,28 @@
     private Uri shadyActionUri = Uri.parse(SHADY_ACTION_URI_STRING);
 
     private ContentResolver mContentResolver;
+    private boolean mIsSlicesDisabled;
 
     @Before
     public void setUp() {
         mContentResolver = mLauncherActivityTestRule.getActivity().getContentResolver();
+        mIsSlicesDisabled = mLauncherActivityTestRule.
+                                getActivity().
+                                getPackageManager().
+                                hasSystemFeature("android.software.slices_disabled" );
     }
 
     @Test
     public void testCallSliceUri_ValidAuthority() {
+        assumeFalse(mIsSlicesDisabled);
+
         doQuery(validActionUri);
     }
 
     @Test(expected = SecurityException.class)
     public void testCallSliceUri_ShadyAuthority() {
+        assumeFalse(mIsSlicesDisabled);
+
         doQuery(shadyActionUri);
     }
 

tests/tests/slice/src/android/slice/cts/SliceProviderTest.kt

diff --git a/tests/tests/slice/src/android/slice/cts/SliceProviderTest.kt b/tests/tests/slice/src/android/slice/cts/SliceProviderTest.kt
index b4e94a2..4533fa2 100644
--- a/tests/tests/slice/src/android/slice/cts/SliceProviderTest.kt
+++ b/tests/tests/slice/src/android/slice/cts/SliceProviderTest.kt
@@ -17,6 +17,7 @@
 import android.app.slice.Slice
 import android.app.slice.SliceSpec
 import android.content.ContentResolver
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Bundle
 
@@ -24,6 +25,7 @@
 import androidx.test.rule.ActivityTestRule
 import androidx.test.runner.AndroidJUnit4
 import org.junit.Before
+import org.junit.Assume.assumeFalse
 
 import org.junit.Rule
 import org.junit.Test
@@ -47,20 +49,31 @@
 
     private lateinit var contentResolver: ContentResolver
 
+    private var isSlicesDisabled: Boolean = false
+
     @Before
     fun setUp() {
         contentResolver = activityTestRule.activity.contentResolver
+        isSlicesDisabled = activityTestRule
+                            .activity
+                            .packageManager
+                            .hasSystemFeature(
+                                "android.software.slices_disabled")
     }
 
     @Test
     @AsbSecurityTest(cveBugId = [138441555])
     fun testCallSliceUri_ValidAuthority() {
+        assumeFalse(isSlicesDisabled)
+
         doQuery(validActionUri)
     }
 
     @Test(expected = SecurityException::class)
     @AsbSecurityTest(cveBugId = [138441555])
     fun testCallSliceUri_ShadyAuthority() {
+        assumeFalse(isSlicesDisabled)
+
         doQuery(shadyActionUri)
     }