diff options
| author | ztenghui <ztenghui@google.com> | 2013-09-12 16:20:19 -0700 |
|---|---|---|
| committer | ztenghui <ztenghui@google.com> | 2013-09-12 16:20:19 -0700 |
| commit | 368bc8441a76e2193859bfd73121787936a0977d (patch) | |
| tree | ec8023dd31a72eb5c456ca37cb7ac868f5c12dfa /src | |
| parent | 8566dd777cd219254c945240a31ac97de28792a2 (diff) | |
| download | android_packages_apps_Snap-368bc8441a76e2193859bfd73121787936a0977d.tar.gz android_packages_apps_Snap-368bc8441a76e2193859bfd73121787936a0977d.tar.bz2 android_packages_apps_Snap-368bc8441a76e2193859bfd73121787936a0977d.zip | |
Fix crash due to a hole in setDataSource.
setDataSource() somehow throws a RuntimeException instead of
IllegalArgumentException when seeing unsupported video file.
bug:10732664
Change-Id: I79ab1f1afd8750bb37df0c8fc9448dbb2e00230a
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/camera/data/LocalMediaData.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java index 8e5216d17..3679b08e4 100644 --- a/src/com/android/camera/data/LocalMediaData.java +++ b/src/com/android/camera/data/LocalMediaData.java @@ -581,7 +581,9 @@ public abstract class LocalMediaData implements LocalData { String rotation = null; try { retriever.setDataSource(path); - } catch (IllegalArgumentException ex) { + } catch (RuntimeException ex) { + // setDataSource() can cause RuntimeException beyond + // IllegalArgumentException. e.g: data contain *.avi file. retriever.release(); Log.e(TAG, "MediaMetadataRetriever.setDataSource() fail:" + ex.getMessage()); |