diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-02-12 02:24:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-02-12 02:24:34 +0000 |
| commit | 1d160fd11e594a7ae77ae09d9f561b02cc9030a0 (patch) | |
| tree | bf6052668c6ff275f680f6b5f81ddb752d759984 /src/com/android/gallery3d/filtershow/filters | |
| parent | 3e926284099152f14a78910c744d462d13a044e5 (diff) | |
| parent | d3b009b2c15c607c0b4bcc72412c45d231e26ca2 (diff) | |
| download | android_packages_apps_Snap-1d160fd11e594a7ae77ae09d9f561b02cc9030a0.tar.gz android_packages_apps_Snap-1d160fd11e594a7ae77ae09d9f561b02cc9030a0.tar.bz2 android_packages_apps_Snap-1d160fd11e594a7ae77ae09d9f561b02cc9030a0.zip | |
Merge "Adding support for ICS" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java index 0f1e8d600..416af9417 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterBorder.java @@ -91,7 +91,7 @@ public class ImageFilterBorder extends ImageFilter { public Drawable getDrawable(int rsc) { Drawable drawable = mDrawables.get(rsc); - if (drawable == null && mResources != null) { + if (drawable == null && mResources != null && rsc != 0) { drawable = new BitmapDrawable(mResources, BitmapFactory.decodeResource(mResources, rsc)); mDrawables.put(rsc, drawable); } |