From a74c77991a41ec51403af179d63996f004618ef5 Mon Sep 17 00:00:00 2001
From: Toshikazu Saito <toshikazu.x.saito@sony.com>
Date: Fri, 13 Jul 2018 10:37:59 +0900
Subject: [PATCH] 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
---
 media/java/android/media/MediaScanner.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index 2eed70f023b17..7ced3e453a59a 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -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) {