summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2014-06-26 00:32:03 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-26 00:32:03 +0000
commit346d97112e26407d9e4a207fe0178994ee6579e1 (patch)
tree7c00adc52865d8f872e37afbf33a90c889ff044f /rs
parent0d703e4a35d52c1d8900cd6142f84a0d118b8014 (diff)
parent6b52ca5949545dcb654672663e2187a70b04f442 (diff)
downloadframeworks_base-346d97112e26407d9e4a207fe0178994ee6579e1.zip
frameworks_base-346d97112e26407d9e4a207fe0178994ee6579e1.tar.gz
frameworks_base-346d97112e26407d9e4a207fe0178994ee6579e1.tar.bz2
am 6b52ca59: am 89e4c715: am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."
* commit '6b52ca5949545dcb654672663e2187a70b04f442': Add check and throw for failed Intrinsic init.
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/ScriptIntrinsic.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsic.java b/rs/java/android/renderscript/ScriptIntrinsic.java
index 8719e01..4edce84 100644
--- a/rs/java/android/renderscript/ScriptIntrinsic.java
+++ b/rs/java/android/renderscript/ScriptIntrinsic.java
@@ -27,5 +27,8 @@ package android.renderscript;
public abstract class ScriptIntrinsic extends Script {
ScriptIntrinsic(long id, RenderScript rs) {
super(id, rs);
+ if (id == 0) {
+ throw new RSRuntimeException("Loading of ScriptIntrinsic failed.");
+ }
}
}