diff options
| author | Ruben Brunk <rubenbrunk@google.com> | 2013-03-14 23:07:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-14 23:08:00 +0000 |
| commit | 55be3667e6807261a8b60185aff63f9669c26f84 (patch) | |
| tree | 85e7073c728355760973f8ea960acbc4cb98d23b /src | |
| parent | ae42bc21941565920db450ea68a7c5de3433196d (diff) | |
| parent | 9591c24b04ef85f971f89ed8cf8b4b28f9d2eb9e (diff) | |
| download | android_packages_apps_Snap-55be3667e6807261a8b60185aff63f9669c26f84.tar.gz android_packages_apps_Snap-55be3667e6807261a8b60185aff63f9669c26f84.tar.bz2 android_packages_apps_Snap-55be3667e6807261a8b60185aff63f9669c26f84.zip | |
Merge "Requested RS method rename." into gb-ub-photos-bryce
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 0ed90c4fe..081cf5d9a 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -138,7 +138,7 @@ public class FilterShowActivity extends Activity implements OnItemClickListener, clearGalleryBitmapPool(); setupMasterImage(); - ImageFilterRS.setRenderScriptContext(this); + ImageFilterRS.createRenderscriptContext(this); setDefaultValues(); fillEditors(); diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java index 3d355627e..2ebd61f3d 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java @@ -108,7 +108,7 @@ public abstract class ImageFilterRS extends ImageFilter { return sRS; } - public static synchronized void setRenderScriptContext(Activity context) { + public static synchronized void createRenderscriptContext(Activity context) { if( sRS != null) { Log.w(LOGTAG, "A prior RS context exists when calling setRenderScriptContext"); destroyRenderScriptContext(); |