Camera: disable thumbnail extra check. DO NOT MERGE
Bug: 11117639
Change-Id: I9a0ce0e61087c803e139002d8bd26d8e08665c76
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 979e27b..f877d8b 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -809,21 +809,6 @@
assertTrue(mJpegPictureCallbackResult);
exif = new ExifInterface(JPEG_PATH);
assertFalse(exif.hasThumbnail());
- // Primary image should still be valid for no thumbnail capture.
- BitmapFactory.decodeFile(JPEG_PATH, bmpOptions);
- if (!recording) {
- assertTrue("Jpeg primary image size should match requested size",
- bmpOptions.outWidth == pictureSize.width &&
- bmpOptions.outHeight == pictureSize.height);
- } else {
- assertTrue(bmpOptions.outWidth >= recordingWidth ||
- bmpOptions.outWidth == size.width);
- assertTrue(bmpOptions.outHeight >= recordingHeight ||
- bmpOptions.outHeight == size.height);
- }
-
- assertNotNull("Jpeg primary image data should be decodable",
- BitmapFactory.decodeFile(JPEG_PATH));
}
@UiThreadTest