am 71dbe44d: Revert "Revert "CTS: Fixes a possible "out of memory" exception""
* commit '71dbe44d5e0a1a12c620c6c81173873d786a4023':
Revert "Revert "CTS: Fixes a possible "out of memory" exception""
diff --git a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
index e6fefe7..d75b5bc 100644
--- a/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/CameraTest.java
@@ -334,9 +334,11 @@
assertTrue(mShutterCallbackResult);
assertTrue(mJpegPictureCallbackResult);
assertNotNull(mJpegData);
- Bitmap b = BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length);
- assertEquals(pictureSize.width, b.getWidth());
- assertEquals(pictureSize.height, b.getHeight());
+ BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
+ bmpOptions.inJustDecodeBounds = true;
+ BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length, bmpOptions);
+ assertEquals(pictureSize.width, bmpOptions.outWidth);
+ assertEquals(pictureSize.height, bmpOptions.outHeight);
}
@TestTargets({
@@ -808,9 +810,11 @@
ExifInterface exif = new ExifInterface(JPEG_PATH);
assertTrue(exif.hasThumbnail());
byte[] thumb = exif.getThumbnail();
- Bitmap b = BitmapFactory.decodeByteArray(thumb, 0, thumb.length);
- assertEquals(size.width, b.getWidth());
- assertEquals(size.height, b.getHeight());
+ BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
+ bmpOptions.inJustDecodeBounds = true;
+ BitmapFactory.decodeByteArray(thumb, 0, thumb.length, bmpOptions);
+ assertEquals(size.width, bmpOptions.outWidth);
+ assertEquals(size.height, bmpOptions.outHeight);
// Test no thumbnail case.
p.setJpegThumbnailSize(0, 0);
@@ -1534,11 +1538,11 @@
waitForSnapshotDone();
assertTrue(mJpegPictureCallbackResult);
assertNotNull(mJpegData);
- Bitmap b = BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length);
- assertEquals(pictureSize.width, b.getWidth());
- assertEquals(pictureSize.height, b.getHeight());
- b.recycle();
- b = null;
+ BitmapFactory.Options bmpOptions = new BitmapFactory.Options();
+ bmpOptions.inJustDecodeBounds = true;
+ BitmapFactory.decodeByteArray(mJpegData, 0, mJpegData.length, bmpOptions);
+ assertEquals(pictureSize.width, bmpOptions.outWidth);
+ assertEquals(pictureSize.height, bmpOptions.outHeight);
}
}
terminateMessageLooper();