commit 10913a5c37ba119bef335320d3e8be25212c05ad
author Tim Murray <timmurray@google.com> Tue Aug 20 17:19:47 2013 -0700
committer Tim Murray <timmurray@google.com> Wed Aug 21 15:13:44 2013 -0700
tree 469d96dc19e4d9b4efecb76147cced747256787f
parent 21fa7a0a23eddab88ff261017f6d7a2548b4d89a

Make error handling kill context activity. Add parameter validation.

bug 10427951

Change-Id: I4abba969e34903265b84ee88d6a90bc9b9df5481

cpp/Script.cpp

diff --git a/cpp/Script.cpp b/cpp/Script.cpp
index 29fe12d..8e1af54 100644
--- a/cpp/Script.cpp
+++ b/cpp/Script.cpp
@@ -17,12 +17,13 @@
 #include <malloc.h>
 
 #include "RenderScript.h"
+#include "rsCppInternal.h"
 
 using namespace android;
 using namespace RSC;
 
 void Script::invoke(uint32_t slot, const void *v, size_t len) const {
-    RS::dispatch->ScriptInvokeV(mRS->getContext(), getID(), slot, v, len);
+    tryDispatch(mRS, RS::dispatch->ScriptInvokeV(mRS->getContext(), getID(), slot, v, len));
 }
 
 void Script::forEach(uint32_t slot, sp<const Allocation> ain, sp<const Allocation> aout,
@@ -32,7 +33,7 @@
     }
     void *in_id = BaseObj::getObjID(ain);
     void *out_id = BaseObj::getObjID(aout);
-    RS::dispatch->ScriptForEach(mRS->getContext(), getID(), slot, in_id, out_id, usr, usrLen, NULL, 0);
+    tryDispatch(mRS, RS::dispatch->ScriptForEach(mRS->getContext(), getID(), slot, in_id, out_id, usr, usrLen, NULL, 0));
 }
 
 
@@ -41,16 +42,16 @@
 
 
 void Script::bindAllocation(sp<Allocation> va, uint32_t slot) const {
-    RS::dispatch->ScriptBindAllocation(mRS->getContext(), getID(), BaseObj::getObjID(va), slot);
+    tryDispatch(mRS, RS::dispatch->ScriptBindAllocation(mRS->getContext(), getID(), BaseObj::getObjID(va), slot));
 }
 
 
 void Script::setVar(uint32_t index, sp<const BaseObj> o) const {
-    RS::dispatch->ScriptSetVarObj(mRS->getContext(), getID(), index, (o == NULL) ? 0 : o->getID());
+    tryDispatch(mRS, RS::dispatch->ScriptSetVarObj(mRS->getContext(), getID(), index, (o == NULL) ? 0 : o->getID()));
 }
 
 void Script::setVar(uint32_t index, const void *v, size_t len) const {
-    RS::dispatch->ScriptSetVarV(mRS->getContext(), getID(), index, v, len);
+    tryDispatch(mRS, RS::dispatch->ScriptSetVarV(mRS->getContext(), getID(), index, v, len));
 }
 
 void Script::FieldBase::init(sp<RS> rs, uint32_t dimx, uint32_t usages) {