Merge "Fix Allocation-less launches"

2015-05-05 21:57:26 +00:00
parent 2f91dd18fa bc5c64b725
commit d5c780a787
2 changed files with 4 additions and 4 deletions
--- a/rs/java/android/renderscript/Script.java
+++ b/rs/java/android/renderscript/Script.java
@@ -182,9 +182,9 @@ public class Script extends BaseObj {
        mRS.validateObject(ain);
        mRS.validateObject(aout);

-        if (ain == null && aout == null) {
+        if (ain == null && aout == null && sc == null) {
            throw new RSIllegalArgumentException(
-                "At least one of ain or aout is required to be non-null.");
+                "At least one of input allocation, output allocation, or LaunchOptions is required to be non-null.");
        }

        long[] in_ids = null;