summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/filtershow/imageshow
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-08-28 11:42:40 -0700
committernicolasroard <nicolasroard@google.com>2013-08-28 11:42:40 -0700
commita7415dd97d9da190e8c23541dcd38f7f670573f6 (patch)
treedeb85eb11b69e898bfec20fdf8d86bdb6add0ae4 /src/com/android/gallery3d/filtershow/imageshow
parente40690d73eb611f3f461f51a2841e73bcbd01f79 (diff)
downloadandroid_packages_apps_Gallery2-a7415dd97d9da190e8c23541dcd38f7f670573f6.tar.gz
android_packages_apps_Gallery2-a7415dd97d9da190e8c23541dcd38f7f670573f6.tar.bz2
android_packages_apps_Gallery2-a7415dd97d9da190e8c23541dcd38f7f670573f6.zip
Fix crash for svelte
bug:10526507 Change-Id: Ifc22bee4af446b09449ee64d137b93573f47025a
Diffstat (limited to 'src/com/android/gallery3d/filtershow/imageshow')
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/MasterImage.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
index 525b45801..8d9d09e72 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/MasterImage.java
@@ -388,6 +388,9 @@ public class MasterImage implements RenderingRequestCaller {
public void onNewLook(FilterRepresentation newRepresentation) {
getBitmapCache().cache(mPreviousImage);
+ if (getFilteredImage() == null) {
+ return;
+ }
mPreviousImage = getBitmapCache().getBitmapCopy(getFilteredImage());
ValueAnimator animator = null;
if (newRepresentation instanceof FilterUserPresetRepresentation) {