Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11f66089 authored by Jin Seok Park's avatar Jin Seok Park Committed by android-build-merger
Browse files

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

am: f66a0737

Change-Id: I60846d7194e72f8362e7e1a411d0eb93b327465a
parents 978f5fd2 f66a0737

media/java/android/media/ExifInterface.java

+4 −6
Original line number Diff line number Diff line
@@ -1794,15 +1794,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"

            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();