From 33acee47cf7e6e107321fdbe4b78554ed2dd6728 Mon Sep 17 00:00:00 2001 From: John Hoford Date: Tue, 2 Apr 2013 15:55:55 -0700 Subject: fix calling Allocation.copyFrom without context bug:8526929 Change-Id: I407539fae153642ea9be46a2f4102ab827e24164 --- src/com/android/gallery3d/filtershow/cache/CachingPipeline.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java index 8c312a92b..4279b47fb 100644 --- a/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/CachingPipeline.java @@ -393,7 +393,9 @@ public class CachingPipeline { mOutPixelsAllocation.getType()); needsUpdate = true; } - mInPixelsAllocation.copyFrom(bitmap); + if (RS != null) { + mInPixelsAllocation.copyFrom(bitmap); + } if (bitmap.getWidth() != mWidth || bitmap.getHeight() != mHeight) { mWidth = bitmap.getWidth(); -- cgit v1.2.3