Merge changes from topic "am-34d0daed14804ba28e3c704dabdb9fc0"

* changes:
  Merge "Fix data source for HEIF exif extractor" am: 31bbb473ce am: e655bf6d4b am: 65a4a60827
  Merge "Change caught exception in MediaScanner when ExifInterface is created" am: 0915931939 am: 544c774381 am: 92ccb271ce
This commit is contained in:
Android Build Merger (Role)
2018-10-26 01:49:40 +00:00
committed by Android (Google) Code Review

View File

@@ -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) {