Merge "Temporarily suppress broken tests in ImageAnalysis and ImageCapture" into androidx-master-dev
diff --git a/camera/camera2/src/androidTest/java/androidx/camera/camera2/ImageAnalysisTest.java b/camera/camera2/src/androidTest/java/androidx/camera/camera2/ImageAnalysisTest.java
index 044a350..b552085 100644
--- a/camera/camera2/src/androidTest/java/androidx/camera/camera2/ImageAnalysisTest.java
+++ b/camera/camera2/src/androidTest/java/androidx/camera/camera2/ImageAnalysisTest.java
@@ -46,6 +46,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.LargeTest;
import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
import androidx.test.rule.GrantPermissionRule;
import org.junit.After;
@@ -205,6 +206,7 @@
assertThat(mAnalysisResults).isEmpty();
}
+ @Suppress // TODO(b/133171096): Remove once this no longer throws an IllegalStateException
@MediumTest
@Test
public void updateSessionConfigWithSuggestedResolution() throws InterruptedException {
diff --git a/camera/camera2/src/androidTest/java/androidx/camera/camera2/ImageCaptureTest.java b/camera/camera2/src/androidTest/java/androidx/camera/camera2/ImageCaptureTest.java
index 19ea743..ac73ef6 100644
--- a/camera/camera2/src/androidTest/java/androidx/camera/camera2/ImageCaptureTest.java
+++ b/camera/camera2/src/androidTest/java/androidx/camera/camera2/ImageCaptureTest.java
@@ -66,6 +66,7 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.FlakyTest;
import androidx.test.filters.SmallTest;
+import androidx.test.filters.Suppress;
import androidx.test.rule.GrantPermissionRule;
import org.junit.After;
@@ -457,6 +458,7 @@
.onError(eq(UseCaseError.FILE_IO_ERROR), anyString(), any(Throwable.class));
}
+ @Suppress // TODO(b/133171096): Remove once this no longer throws an IllegalStateException
@Test
public void updateSessionConfigWithSuggestedResolution() throws InterruptedException {
ImageCaptureConfig config =
