Fix crashes with RS filters

bug:8418537

Change-Id: I37f8ad8a77f04faed9f721122872f00f7aaaa365

1 files changed, 11 insertions, 7 deletions

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index bd9dcafcf..63a76627a 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -22,11 +22,11 @@ import android.widget.Toast;
 
 import com.android.gallery3d.filtershow.FilterShowActivity;
 import com.android.gallery3d.filtershow.imageshow.GeometryMetadata;
+import com.android.gallery3d.filtershow.presets.FilterEnvironment;
 import com.android.gallery3d.filtershow.presets.ImagePreset;
 
 public abstract class ImageFilter implements Cloneable {
-
-    private ImagePreset mImagePreset;
+    private FilterEnvironment mEnvironment = null;
 
     protected String mName = "Original";
     private final String LOGTAG = "ImageFilter";
@@ -79,11 +79,7 @@ public abstract class ImageFilter implements Cloneable {
     }
 
     public ImagePreset getImagePreset() {
-        return mImagePreset;
-    }
-
-    public void setImagePreset(ImagePreset imagePreset) {
-        mImagePreset = imagePreset;
+        return getEnvironment().getImagePreset();
     }
 
     public abstract void useRepresentation(FilterRepresentation representation);
@@ -103,4 +99,12 @@ public abstract class ImageFilter implements Cloneable {
                 w, h);
         return originalToScreen;
     }
+
+    public void setEnvironment(FilterEnvironment environment) {
+        mEnvironment = environment;
+    }
+
+    public FilterEnvironment getEnvironment() {
+        return mEnvironment;
+    }
 }