commit 749c179ed5a1cdb2f6742fbe3bb491404a19acca
author Jason Sams <jsams@google.com> Tue Oct 16 10:55:20 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 16 10:55:20 2012 -0700
tree 8ca0455545e0cb505536dd3fcf4582d2cf687500
parent f28a31db78004447071b6f44369df20e36ae801e
parent 8d0c431a5284a7374b889b9b719e88ba993469f9

am 8d0c431a: am 009d5413: Merge "Fix bugs in scriptGroup." into jb-mr1-dev

* commit '8d0c431a5284a7374b889b9b719e88ba993469f9':
  Fix bugs in scriptGroup.

graphics/java/android/renderscript/ScriptIntrinsicBlur.java

diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java
index 2a04b42..11164e3 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java
@@ -63,7 +63,7 @@
      */
     public void setInput(Allocation ain) {
         mInput = ain;
-        bindAllocation(ain, 1);
+        setVar(1, ain);
     }
 
     /**

graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java

diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
index d7e9f32..91efa02 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java
@@ -68,7 +68,7 @@
      */
     public void setInput(Allocation ain) {
         mInput = ain;
-        bindAllocation(ain, 1);
+        setVar(1, ain);
     }
 
     /**

graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java

diff --git a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java b/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
index ff31270..1f52e3f 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java
@@ -61,7 +61,7 @@
      */
     public void setInput(Allocation ain) {
         mInput = ain;
-        bindAllocation(ain, 1);
+        setVar(1, ain);
     }
 
     /**

graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java

diff --git a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java b/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
index 415061c..dc8a5aa 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java
@@ -56,7 +56,7 @@
      */
     public void setInput(Allocation ain) {
         mInput = ain;
-        bindAllocation(ain, 0);
+        setVar(0, ain);
     }
 
     /**