Ignore UnbundledChooserActivityTest
Test: atest
Bug: 233861389
Change-Id: Ifce748554d8bd5287a96902c370a39d7f7b04511
diff --git a/java/tests/AndroidTest.xml b/java/tests/AndroidTest.xml
index d1d77c1..3daafee 100644
--- a/java/tests/AndroidTest.xml
+++ b/java/tests/AndroidTest.xml
@@ -14,15 +14,17 @@
limitations under the License.
-->
<configuration description="Run IntentResolver Tests.">
- <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
- <option name="test-file-name" value="IntentResolverUnitTests.apk" />
- </target_preparer>
+ <!-- Restore these lines once the unbundled chooser is re-enabled.
+ <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+ <option name="test-file-name" value="IntentResolverUnitTests.apk" />
+ </target_preparer>
- <option name="test-suite-tag" value="apct" />
- <option name="test-tag" value="IntentResolverUnitTests" />
- <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
- <option name="package" value="com.android.intentresolver.tests" />
- <option name="runner" value="android.testing.TestableInstrumentation" />
- <option name="hidden-api-checks" value="false"/>
- </test>
+ <option name="test-suite-tag" value="apct" />
+ <option name="test-tag" value="IntentResolverUnitTests" />
+ <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+ <option name="package" value="com.android.intentresolver.tests" />
+ <option name="runner" value="android.testing.TestableInstrumentation" />
+ <option name="hidden-api-checks" value="false"/>
+ </test>
+ -->
</configuration>
diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
index 7dda036..dd3b00e 100644
--- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
+++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java
@@ -29,6 +29,7 @@
import com.android.internal.app.ChooserActivity;
import com.android.internal.app.ChooserActivityTest;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -38,6 +39,7 @@
import java.util.Collection;
import java.util.function.Function;
+@Ignore("can't run until unbundled chooser is back in builds")
@RunWith(Parameterized.class)
public class UnbundledChooserActivityTest extends ChooserActivityTest {
private static final Function<PackageManager, PackageManager> DEFAULT_PM = pm -> pm;
