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

Commit 88a07ff4 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-34d0daed14804ba28e3c704dabdb9fc0" 

* changes:
  Merge "Fix data source for HEIF exif extractor" am: 31bbb473 am: e655bf6d am: 65a4a608
  Merge "Change caught exception in MediaScanner when ExifInterface is created" am: 09159319 am: 544c7743 am: 92ccb271
parents d14733d7 17807ec5

media/java/android/media/MediaScanner.java

+1 −1
Original line number Diff line number Diff line
@@ -986,7 +986,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) {