diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-08-28 11:51:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-28 11:51:31 -0700 |
| commit | 8f9a9794fff0e24cb5d553e75ff3d64eaf12b92e (patch) | |
| tree | f738b103e373c0ad842c781095233af4c8b1e705 | |
| parent | b54ad0e98c20a8fa8e91d03acda256a428f95f49 (diff) | |
| parent | 848cb777cd91379b1a5c1d6b1218f950fa33f545 (diff) | |
| download | android_packages_apps_Gallery2-8f9a9794fff0e24cb5d553e75ff3d64eaf12b92e.tar.gz android_packages_apps_Gallery2-8f9a9794fff0e24cb5d553e75ff3d64eaf12b92e.tar.bz2 android_packages_apps_Gallery2-8f9a9794fff0e24cb5d553e75ff3d64eaf12b92e.zip | |
am 848cb777: am a7415dd9: Fix crash for svelte
* commit '848cb777cd91379b1a5c1d6b1218f950fa33f545':
Fix crash for svelte
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/MasterImage.java | 3 |
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) { |