commit 5be70d014bc9be603a91e298129e54e9b45ac13a
author Yang Ni <yangni@google.com> Thu Apr 20 22:58:37 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Apr 20 22:58:37 2017 +0000
tree 1974940c30764d3a6a1584c495757aa95c121e97
parent 637e091623ba15853d0e5756face00b8f0961c72
parent cfe40aa165387d7c1c4c8ba4df87e2c4cee83e5b

Merge "Validates Intrinsic Blur only takes 2D Allocations" am: b44f4d2f51 am: 0962a6e83c
am: cfe40aa165

Change-Id: I7f191c2da99f310b4af599ab4849daeb90eb7497

rs/java/android/renderscript/ScriptIntrinsicBlur.java

diff --git a/rs/java/android/renderscript/ScriptIntrinsicBlur.java b/rs/java/android/renderscript/ScriptIntrinsicBlur.java
index 7a702e8..a36873e 100644
--- a/rs/java/android/renderscript/ScriptIntrinsicBlur.java
+++ b/rs/java/android/renderscript/ScriptIntrinsicBlur.java
@@ -59,6 +59,9 @@
      * @param ain The input allocation
      */
     public void setInput(Allocation ain) {
+        if (ain.getType().getY() == 0) {
+            throw new RSIllegalArgumentException("Input set to a 1D Allocation");
+        }
         mInput = ain;
         setVar(1, ain);
     }
@@ -85,6 +88,9 @@
      *             type.
      */
     public void forEach(Allocation aout) {
+        if (aout.getType().getY() == 0) {
+            throw new RSIllegalArgumentException("Output is a 1D Allocation");
+        }
         forEach(0, (Allocation) null, aout, null);
     }
 
@@ -97,6 +103,9 @@
      * @param opt LaunchOptions for clipping
      */
     public void forEach(Allocation aout, Script.LaunchOptions opt) {
+        if (aout.getType().getY() == 0) {
+            throw new RSIllegalArgumentException("Output is a 1D Allocation");
+        }
         forEach(0, (Allocation) null, aout, null, opt);
     }