diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-03-27 22:10:01 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-03-27 23:28:15 -0700 |
| commit | 83facdef714b729aeab4d51919206d95a7afb165 (patch) | |
| tree | 116257518dc9e6a359dc16baf8c7cfa7b76784c9 /src/com/android/gallery3d/filtershow/FilterShowActivity.java | |
| parent | 6d2104b2dd31e39e8f3c178375d4d91055a24a54 (diff) | |
| download | android_packages_apps_Snap-83facdef714b729aeab4d51919206d95a7afb165.tar.gz android_packages_apps_Snap-83facdef714b729aeab4d51919206d95a7afb165.tar.bz2 android_packages_apps_Snap-83facdef714b729aeab4d51919206d95a7afb165.zip | |
Fix deadlock.
Move the RenderScript context and Resources to CachingPipeline.
bug:8491107
Change-Id: I912555c87b060e4515cc1a4c66c8a8c9c840532d
Diffstat (limited to 'src/com/android/gallery3d/filtershow/FilterShowActivity.java')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 14a51392c..409f1e366 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -50,6 +50,7 @@ import android.widget.Toast; import com.android.gallery3d.R; import com.android.gallery3d.data.LocalAlbum; +import com.android.gallery3d.filtershow.cache.CachingPipeline; import com.android.gallery3d.filtershow.cache.FilteringPipeline; import com.android.gallery3d.filtershow.cache.ImageLoader; import com.android.gallery3d.filtershow.editors.BasicEditor; @@ -135,8 +136,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, clearGalleryBitmapPool(); + CachingPipeline.createRenderscriptContext(this); setupMasterImage(); - ImageFilterRS.createRenderscriptContext(this); setDefaultValues(); fillEditors(); @@ -526,7 +527,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, FiltersManager.getPreviewManager().freeRSFilterScripts(); FiltersManager.getManager().freeRSFilterScripts(); FiltersManager.reset(); - ImageFilterRS.destroyRenderScriptContext(); + CachingPipeline.destroyRenderScriptContext(); super.onDestroy(); } |