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

Commit 76c26c13 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "ExifInterface: do not spam stacktrace on invalid format" into main am:... 

Merge "ExifInterface: do not spam stacktrace on invalid format" into main am: adf6d635 am: 2fef48ed

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3497791



Change-Id: I64bf7f681ad7dd12ce7dc37f959eb0bab54d59f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents befcf807 2fef48ed

media/java/android/media/ExifInterface.java

+4 −3
Original line number Diff line number Diff line
@@ -2037,9 +2037,10 @@ public class ExifInterface { 
            // Ignore exceptions in order to keep the compatibility with the old versions of

            // ExifInterface.

            mIsSupportedFile = false;

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

            Log.d(

                    TAG,

                    "Invalid image: ExifInterface got an unsupported or corrupted image file",

                    e);

        } finally {

            addDefaultValuesForCompatibility();