diff options
| author | Jason Sams <jsams@google.com> | 2015-05-05 18:00:34 -0700 |
|---|---|---|
| committer | Jason Sams <jsams@google.com> | 2015-05-05 18:00:34 -0700 |
| commit | d1516dffa8d676fcad092d9736163829e6d0fdce (patch) | |
| tree | 14fd6780659583b86cbc27ce8299768bfff0b2c8 /rs/java | |
| parent | e74007ded3a34d6aaf7dc4fe7f2c18b04b47de3b (diff) | |
| download | frameworks_base-d1516dffa8d676fcad092d9736163829e6d0fdce.zip frameworks_base-d1516dffa8d676fcad092d9736163829e6d0fdce.tar.gz frameworks_base-d1516dffa8d676fcad092d9736163829e6d0fdce.tar.bz2 | |
Fix Allocation-less launches
Cherry-pick fix from AOSP. Error check for kernel launch was
generating a false positive.
bug 20690242
Change-Id: Ic4c6644072a11aab9a273070be5734519136f685
Diffstat (limited to 'rs/java')
| -rw-r--r-- | rs/java/android/renderscript/Script.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/java/android/renderscript/Script.java b/rs/java/android/renderscript/Script.java index 6a1efee..7cd6d09 100644 --- 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; |