Merge "Rethrow non-recoverable errors when using sqlite with a better error." into androidx-master-dev

diff --git a/buildSrc-tests/src/test/kotlin/androidx/build/VersionTest.kt b/buildSrc-tests/src/test/kotlin/androidx/build/VersionTest.kt
index be02e66..9fdee1f 100644
--- a/buildSrc-tests/src/test/kotlin/androidx/build/VersionTest.kt
+++ b/buildSrc-tests/src/test/kotlin/androidx/build/VersionTest.kt

@@ -25,8 +25,6 @@
 class VersionTest {
     @Test
     fun testComparisons() {
-        assert(true > false)
-
         val version2600 = Version("26.0.0")
         val version2610 = Version("26.1.0")
         val version2611 = Version("26.1.1")

diff --git a/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewMeteringPointFactoryTest.java b/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewMeteringPointFactoryTest.java
index 34ddbe3..a14f989 100644
--- a/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewMeteringPointFactoryTest.java
+++ b/camera/camera-view/src/androidTest/java/androidx/camera/view/TextureViewMeteringPointFactoryTest.java

@@ -49,6 +49,7 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.filters.Suppress;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.rule.GrantPermissionRule;
@@ -65,6 +66,7 @@
 import java.util.concurrent.TimeUnit;
 
 @LargeTest
+@Suppress // "Suppress these tests until they can be fixed, see b/143453238"
 @RunWith(AndroidJUnit4.class)
 public class TextureViewMeteringPointFactoryTest {
     public static final float TOLERANCE = 0.000001f;

diff --git a/camera/camera-view/src/androidTest/java/androidx/camera/view/TransformableSurfaceViewTest.java b/camera/camera-view/src/androidTest/java/androidx/camera/view/TransformableSurfaceViewTest.java
index e02a092..fdc157b 100644
--- a/camera/camera-view/src/androidTest/java/androidx/camera/view/TransformableSurfaceViewTest.java
+++ b/camera/camera-view/src/androidTest/java/androidx/camera/view/TransformableSurfaceViewTest.java

@@ -28,6 +28,7 @@
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
+import androidx.test.filters.Suppress;
 import androidx.test.rule.ActivityTestRule;
 
 import org.junit.Before;
@@ -39,6 +40,7 @@
  * Instrumented tests for {@link TransformableSurfaceView}.
  */
 @LargeTest
+@Suppress
 @RunWith(AndroidJUnit4.class)
 public class TransformableSurfaceViewTest {