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

Commit a74c7799 authored by Toshikazu Saito's avatar Toshikazu Saito Committed by Takahiro Aizawa
Browse files

Change caught exception in MediaScanner when ExifInterface is created 

Some HEIF content happens RuntimeException in ExifInterface because
sniff is failed and MediaExtractor is not found. If exception happens,
scanning is aborted. So all contents may not be registered to database
correctly. To avoid that, this fix changes caught exception from
IOException to Exception for creating ExifInterface.

Bug: 117625929
Test: put some HEIF contents and check on photos

Change-Id: I6d32dec27c3be13993ec08f92d567b772d03ace9
parent 35d9291c

media/java/android/media/MediaScanner.java

+1 −1
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ public class MediaScanner implements AutoCloseable { 
                ExifInterface exif = null;

                try {

                    exif = new ExifInterface(entry.mPath);

                } catch (IOException ex) {

                } catch (Exception ex) {

                    // exif is null

                }

                if (exif != null) {