Catch OutOfMemoryError and log warning

Bug: 133827762
Test: atest CtsMediaTestCases:android.media.cts.ExifInterfaceTest
Change-Id: I5c6e247136e033968f418a50276971a8a686e021
This commit is contained in:
Jin Seok Park
2019-05-30 14:22:51 +09:00
parent a47901806e
commit 6e3113302f

View File

@@ -1790,15 +1790,13 @@ public class ExifInterface {
// Set thumbnail image offset and length
setThumbnailData(inputStream);
mIsSupportedFile = true;
} catch (IOException e) {
} catch (IOException | OutOfMemoryError e) {
// Ignore exceptions in order to keep the compatibility with the old versions of
// ExifInterface.
mIsSupportedFile = false;
if (DEBUG) {
Log.d(TAG, "Invalid image: ExifInterface got an unsupported image format file"
+ "(ExifInterface supports JPEG and some RAW image formats only) "
+ "or a corrupted JPEG file to ExifInterface.", e);
}
Log.w(TAG, "Invalid image: ExifInterface got an unsupported image format file"
+ "(ExifInterface supports JPEG and some RAW image formats only) "
+ "or a corrupted JPEG file to ExifInterface.", e);
} finally {
addDefaultValuesForCompatibility();