summaryrefslogtreecommitdiffstats
path: root/graphics/java
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2011-01-19 16:49:17 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-19 16:49:17 -0800
commit1368436e428e2af1241bf88cb0688f288f96da1c (patch)
treef183904ced5f75c99097bac91b9f28b4a5d7103c /graphics/java
parent28f0a53a882a39bc22bc5892250411cadf6c0d5d (diff)
parentfdc54a97ee588bbd6c981a5708050fd97f01baec (diff)
downloadframeworks_base-1368436e428e2af1241bf88cb0688f288f96da1c.zip
frameworks_base-1368436e428e2af1241bf88cb0688f288f96da1c.tar.gz
frameworks_base-1368436e428e2af1241bf88cb0688f288f96da1c.tar.bz2
Merge "Check and propogate errors from llvm." into honeycomb
Diffstat (limited to 'graphics/java')
-rw-r--r--graphics/java/android/renderscript/ScriptC.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/graphics/java/android/renderscript/ScriptC.java b/graphics/java/android/renderscript/ScriptC.java
index ff8f093..9445283 100644
--- a/graphics/java/android/renderscript/ScriptC.java
+++ b/graphics/java/android/renderscript/ScriptC.java
@@ -56,6 +56,9 @@ public class ScriptC extends Script {
protected ScriptC(RenderScript rs, Resources resources, int resourceID) {
super(0, rs);
int id = internalCreate(rs, resources, resourceID);
+ if (id == 0) {
+ throw new RSRuntimeException("Loading of ScriptC script failed.");
+ }
setID(id);
}