summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2009-08-20 17:22:40 -0700
committerJason Sams <rjsams@android.com>2009-08-20 17:22:40 -0700
commitd8e4161f114331343b897cbacea927e7e60e7b17 (patch)
treeb9386c3681b6ceed3703c47acfa0a25f3ab9656e /graphics/java
parent25ffcdc9d7e32c9c1eeb2b48cc2f17d1353e9fae (diff)
downloadframeworks_base-d8e4161f114331343b897cbacea927e7e60e7b17.zip
frameworks_base-d8e4161f114331343b897cbacea927e7e60e7b17.tar.gz
frameworks_base-d8e4161f114331343b897cbacea927e7e60e7b17.tar.bz2
Allow null to be re-bound as a root script. This was always legal from native and just a limitation of the java binding for the API.
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/renderscript/RenderScript.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java
index 076a5d4..1bdabe7 100644
--- a/graphics/java/android/renderscript/RenderScript.java
+++ b/graphics/java/android/renderscript/RenderScript.java
@@ -281,7 +281,11 @@ public class RenderScript {
// Root state
public void contextBindRootScript(Script s) {
- nContextBindRootScript(s.mID);
+ int id = 0;
+ if(s != null) {
+ id = s.mID;
+ }
+ nContextBindRootScript(id);
}
//public void contextBindSampler(Sampler s, int slot) {