summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Roard <nicolasroard@google.com>2013-09-11 16:48:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-11 16:48:38 +0000
commitf7630cbd1786f88256e03c246a2931b3734ab82f (patch)
tree950bce3f868d452d8c76e6753cefb59bac0fc9b8
parent2975e608d638a6d707b64a5b31fde3716f12ee9c (diff)
parenta888340582b3b736d9f71390a670bd23cff0e86a (diff)
downloadandroid_packages_apps_Gallery2-f7630cbd1786f88256e03c246a2931b3734ab82f.tar.gz
android_packages_apps_Gallery2-f7630cbd1786f88256e03c246a2931b3734ab82f.tar.bz2
android_packages_apps_Gallery2-f7630cbd1786f88256e03c246a2931b3734ab82f.zip
Merge "Handle IllegalStateException when cursor contents are empty" into gb-ub-photos-carlsbad
-rw-r--r--src/com/android/gallery3d/filtershow/cache/ImageLoader.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 97474b67d..92942d4fc 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -124,6 +124,8 @@ public final class ImageLoader {
// Do nothing
} catch (IllegalArgumentException e) {
// Do nothing
+ } catch (IllegalStateException e) {
+ // Do nothing
} finally {
Utils.closeSilently(cursor);
}