diff options
| author | Pin Ting <pinting@google.com> | 2012-01-13 17:48:10 +0800 |
|---|---|---|
| committer | Pin Ting <pinting@google.com> | 2012-01-16 12:28:32 +0800 |
| commit | f31954e5b5f227b07fe377545fb05327d7e7ffe6 (patch) | |
| tree | f542849d2c44ffa67c01ff0ac7b7255fec64cfd6 /src/com/android/gallery3d/data | |
| parent | d05b0be120bb217b4f56add24a4b31bee92455b2 (diff) | |
| download | android_packages_apps_Gallery2-f31954e5b5f227b07fe377545fb05327d7e7ffe6.tar.gz android_packages_apps_Gallery2-f31954e5b5f227b07fe377545fb05327d7e7ffe6.tar.bz2 android_packages_apps_Gallery2-f31954e5b5f227b07fe377545fb05327d7e7ffe6.zip | |
Fixes gallery crash due to attempt to open deleted photo.
bug:5630894
Change-Id: I540bf067561550def72ac513eed12dcd5a808a1a
Diffstat (limited to 'src/com/android/gallery3d/data')
| -rw-r--r-- | src/com/android/gallery3d/data/DataManager.java | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/data/DataManager.java b/src/com/android/gallery3d/data/DataManager.java index f7dac5ebd..51d4af9eb 100644 --- a/src/com/android/gallery3d/data/DataManager.java +++ b/src/com/android/gallery3d/data/DataManager.java @@ -159,11 +159,16 @@ public class DataManager { return null; } - MediaObject object = source.createMediaObject(path); - if (object == null) { - Log.w(TAG, "cannot create media object: " + path); + try { + MediaObject object = source.createMediaObject(path); + if (object == null) { + Log.w(TAG, "cannot create media object: " + path); + } + return object; + } catch (Throwable t) { + Log.w(TAG, "exception in creating media object: " + path, t); + return null; } - return object; } public MediaObject getMediaObject(String s) { |