am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce

* commit '0c71308c9d2a72d4a3faf00242707de773d5beba':
  interruptible renderer

2 files changed, 13 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java b/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
index 3c53227fc..c454c1ab6 100644
--- a/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
+++ b/src/com/android/gallery3d/filtershow/presets/FilterEnvironment.java
@@ -35,6 +35,16 @@ public class FilterEnvironment {
     private int mQuality;
     private FiltersManager mFiltersManager;
     private CachingPipeline mCachingPipeline;
+    private volatile boolean mStop = false;
+
+    public synchronized boolean needsStop() {
+        return mStop;
+    }
+
+    public synchronized void setStop(boolean stop) {
+        this.mStop = stop;
+    }
+
     private HashMap<Long, WeakReference<Bitmap>>
             bitmapCach = new HashMap<Long, WeakReference<Bitmap>>();
 
diff --git a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
index 558b20e93..d3909cc58 100644
--- a/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/presets/ImagePreset.java
@@ -489,6 +489,9 @@ public class ImagePreset {
                     representation.synchronizeRepresentation();
                 }
                 bitmap = environment.applyRepresentation(representation, bitmap);
+                if (environment.needsStop()) {
+                    return bitmap;
+                }
             }
         }