From bc5c64b72536ac78e6229e8a0423d774da77abe6 Mon Sep 17 00:00:00 2001
From: Jason Sams <jsams@google.com>
Date: Thu, 16 Apr 2015 15:13:52 -0700
Subject: Fix Allocation-less launches

Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
---
 rs/java/android/renderscript/Script.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rs/java/android/renderscript/Script.java')

diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java
index 65056ac5c22d..85d362382f81 100644
--- a/rs/java/android/renderscript/Script.java
+++ b/rs/java/android/renderscript/Script.java
@@ -184,9 +184,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;
-- 
cgit v1.2.3