am 7165bd6d: Merge "Add check and throw for failed Intrinsic init."

* commit '7165bd6d7496159b426f072bdf13adfffc917a24':
  Add check and throw for failed Intrinsic init.

1 files changed, 3 insertions, 0 deletions

diff --git a/rs/java/android/renderscript/ScriptIntrinsic.java b/rs/java/android/renderscript/ScriptIntrinsic.java
index 8719e0170820..4edce84ea3e3 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.");
+        }
     }
 }