Camera: Add primary image validation in testJpegThumbnailSize
Primary image should be still valid when set thumbnail size to (0,0).
Bug: 10148943
Change-Id: I2ee335b0a4a8c5f53fd174d162da61288a6345bd
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index 31a72cf..8975d00 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -774,6 +774,7 @@
assertTrue(sizes.size() >= 2);
assertTrue(sizes.contains(size));
assertTrue(sizes.contains(mCamera.new Size(0, 0)));
+ Size pictureSize = p.getPictureSize();
// Test if the thumbnail size matches the setting.
if (!recording) mCamera.startPreview();
@@ -808,6 +809,13 @@
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);
+ assertTrue("Jpeg primary image size should match requested size",
+ bmpOptions.outWidth == pictureSize.width &&
+ bmpOptions.outHeight == pictureSize.height);
+ assertNotNull("Jpeg primary image data should be decodable",
+ BitmapFactory.decodeFile(JPEG_PATH));
}
@UiThreadTest
