Fixed onDestroy ordering for RS context.

Bug: 8420637
Change-Id: Iddceaa3aefd3d905bbc7435350b768d10215b1d8

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 1e84853..a642839 100644 (file)
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -521,13 +521,14 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
         }
         // TODO:  Using singletons is a bad design choice for many of these
         // due static reference leaks and in general.  Please refactor.
+        FilteringPipeline.getPipeline().turnOnPipeline(false);
         MasterImage.reset();
-        ImageFilterRS.destroyRenderScriptContext();
         FilteringPipeline.reset();
         ImageFilter.resetStatics();
         FiltersManager.getPreviewManager().freeRSFilterScripts();
         FiltersManager.getManager().freeRSFilterScripts();
         FiltersManager.reset();
+        ImageFilterRS.destroyRenderScriptContext();
         super.onDestroy();
     }