diff options
| author | ztenghui <ztenghui@google.com> | 2013-09-13 16:31:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-13 16:31:08 +0000 |
| commit | a7035394b246b238c19230c92672dbda2ab1f88c (patch) | |
| tree | 54398ac02dbe23d66d7828cdc064e9dc86ebca3e /src | |
| parent | 1e689c254960f0ced0d19d91067cc5ef703dec64 (diff) | |
| parent | 368bc8441a76e2193859bfd73121787936a0977d (diff) | |
| download | android_packages_apps_Snap-a7035394b246b238c19230c92672dbda2ab1f88c.tar.gz android_packages_apps_Snap-a7035394b246b238c19230c92672dbda2ab1f88c.tar.bz2 android_packages_apps_Snap-a7035394b246b238c19230c92672dbda2ab1f88c.zip | |
Merge "Fix crash due to a hole in setDataSource." into gb-ub-photos-carlsbad
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()); |