Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch OutOfMemoryError and log warning" into qt-dev

Browse Source 
am: f66a0737ca

Change-Id: I73ffd7764f57470afcaac23ab5546d6ea786c387
This commit is contained in:
Jin Seok Park
2019-05-30 02:55:06 -07:00
committed by android-build-merger
parent 83a528fbf2 f66a0737ca
commit 49d3fb772a
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
media/java/android/media/ExifInterface.java
View File

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