diff options
| author | Stephen Hines <srhines@google.com> | 2012-02-02 21:25:19 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-02 21:25:19 -0800 |
| commit | cc2daede56257f0f1f490a1aebf5b9b898d9816a (patch) | |
| tree | d5e0725d5512e99f9a90a7b2b86da9e4def295c8 | |
| parent | c7aab1a9f179e85580104cc76bdeda5474885ddd (diff) | |
| parent | 862dadb7a7aa290e382ca02a376776e0e27987a1 (diff) | |
| download | frameworks_base-cc2daede56257f0f1f490a1aebf5b9b898d9816a.zip frameworks_base-cc2daede56257f0f1f490a1aebf5b9b898d9816a.tar.gz frameworks_base-cc2daede56257f0f1f490a1aebf5b9b898d9816a.tar.bz2 | |
Merge "Properly recover from failed compilation."
| -rw-r--r-- | graphics/java/android/renderscript/RenderScript.java | 2 | ||||
| -rw-r--r-- | libs/rs/rsScriptC.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index ad10832..03ad5ae 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -837,7 +837,7 @@ public class RenderScript { mRS.mErrorCallback.mErrorNum = subID; mRS.mErrorCallback.run(); } else { - //throw new RSRuntimeException("Received error num " + subID + ", details: " + e); + throw new RSRuntimeException("Received error num " + subID + ", details: " + e); } continue; } diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp index 929dd68..b4eb995 100644 --- a/libs/rs/rsScriptC.cpp +++ b/libs/rs/rsScriptC.cpp @@ -322,7 +322,7 @@ RsScript rsi_ScriptCCreate(Context *rsc, if (!s->runCompiler(rsc, resName, cacheDir, (uint8_t *)text, text_length)) { // Error during compile, destroy s and return null. - delete s; + ObjectBase::checkDelete(s); return NULL; } |