Fix CameraRoll.getPhotos() crash on Android if device has a problematic video asset (#21438)

naxel · facebook-github-bot · commit 4768bea0cf28 · 2018-10-01T14:32:27.000-07:00
Summary: Changed catching IOException to Exception Fixes #20112 Pull Request resolved: #21438 Differential Revision: D10132453 Pulled By: hramos fbshipit-source-id: c68fa8c45d43e4f2d116b8084ffd731ad6bf5aec
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/CameraRollManager.java
@@ -443,7 +443,7 @@ private static boolean putImageInfo(
           retriever.release();
           photoDescriptor.close();
         }
-      } catch (IOException e) {
+      } catch (Exception e) {
         FLog.e(ReactConstants.TAG, "Could not get video metadata for " + photoUri.toString(), e);
         return false;
       }

Original file line number	Diff line number	Diff line change
`@@ -443,7 +443,7 @@ private static boolean putImageInfo(`
`443`	`443`	`retriever.release();`
`444`	`444`	`photoDescriptor.close();`
`445`	`445`	`}`
`446`		`- } catch (IOException e) {`
	`446`	`+ } catch (Exception e) {`
`447`	`447`	`FLog.e(ReactConstants.TAG, "Could not get video metadata for " + photoUri.toString(), e);`
`448`	`448`	`return false;`
`449`	`449`	`}`