commit 94b38f61eb241075ff662759f659dd3713bf5580
author The Android Automerger <android-build@google.com> Tue Oct 15 21:14:16 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Oct 15 21:14:16 2013 -0700
tree cfc7dde89162b7ad1b65902e0f016260b3ffd2a2
parent 11bf46c0cb7963ce103ce8d3f67eb743600e00e8
parent a4427c74f83b1d687cd339d24edc19ccac77ca92

merge in klp-release history after reset to klp-dev

src/com/android/gallery3d/app/Wallpaper.java

diff --git a/src/com/android/gallery3d/app/Wallpaper.java b/src/com/android/gallery3d/app/Wallpaper.java
index 4887e7d..2022f5a 100644
--- a/src/com/android/gallery3d/app/Wallpaper.java
+++ b/src/com/android/gallery3d/app/Wallpaper.java
@@ -31,6 +31,8 @@
 import com.android.gallery3d.filtershow.crop.CropActivity;
 import com.android.gallery3d.filtershow.crop.CropExtras;
 
+import java.lang.IllegalArgumentException;
+
 /**
  * Wallpaper picker for the gallery application. This just redirects to the
  * standard pick action.
@@ -107,6 +109,8 @@
                         return;
                     } catch (ActivityNotFoundException anfe) {
                         // ignored; fallthru to existing crop activity
+                    } catch (IllegalArgumentException iae) {
+                        // ignored; fallthru to existing crop activity
                     }
                 }