Merge "Don't run AR tests in instant mode" into sc-dev
diff --git a/tests/tests/activityrecognition/Android.bp b/tests/tests/activityrecognition/Android.bp
index a2e5729..8982ade 100644
--- a/tests/tests/activityrecognition/Android.bp
+++ b/tests/tests/activityrecognition/Android.bp
@@ -28,6 +28,7 @@
"compatibility-device-util-axt",
"truth-prebuilt",
"ctstestrunner-axt",
+ "platform-test-annotations",
],
test_suites: [
"cts",
diff --git a/tests/tests/activityrecognition/src/android/activityrecognition/cts/ActivityRecognizerAttributionTags.kt b/tests/tests/activityrecognition/src/android/activityrecognition/cts/ActivityRecognizerAttributionTags.kt
index 9dc4013..0162654 100644
--- a/tests/tests/activityrecognition/src/android/activityrecognition/cts/ActivityRecognizerAttributionTags.kt
+++ b/tests/tests/activityrecognition/src/android/activityrecognition/cts/ActivityRecognizerAttributionTags.kt
@@ -23,6 +23,7 @@
import android.content.Context
import android.os.Process
import android.os.UserHandle
+import android.platform.test.annotations.AppModeFull
import androidx.test.platform.app.InstrumentationRegistry
import com.android.compatibility.common.util.SystemUtil
import org.junit.After
@@ -32,6 +33,7 @@
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
+@AppModeFull(reason="Instant apps have no access to the RoleManager")
class RenouncedPermissionsTest {
var oldActivityRecognizers: List<String>? = null