diff options
| author | John Hoford <hoford@google.com> | 2012-10-17 15:53:14 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2012-10-17 16:26:55 -0700 |
| commit | da974d84c8aa0758afe2dc7382657ff5efc80157 (patch) | |
| tree | 2f4bb4d39f68bbe54a22f60b20fb9203b7cac269 /src | |
| parent | 43b906d81caa4379eae1a1643194c8b3d34b1ad5 (diff) | |
| download | android_packages_apps_Gallery2-da974d84c8aa0758afe2dc7382657ff5efc80157.tar.gz android_packages_apps_Gallery2-da974d84c8aa0758afe2dc7382657ff5efc80157.tar.bz2 android_packages_apps_Gallery2-da974d84c8aa0758afe2dc7382657ff5efc80157.zip | |
fix crash from configurable slider ranges
bug:7293391
Change-Id: I17498a2066acdb5c53763610980fe2f6532f2f34
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/ImageShow.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java index 09cdb7914..5c476eb31 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageShow.java @@ -149,7 +149,10 @@ public class ImageShow extends View implements SliderListener, OnSeekBarChangeLi } public void resetParameter() { - onNewValue(getCurrentFilter().getDefaultParameter()); + ImageFilter currentFilter = getCurrentFilter(); + if (currentFilter!=null) { + onNewValue(currentFilter.getDefaultParameter()); + } if (USE_SLIDER_GESTURE) { mSliderController.reset(); } |