Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc2daede authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Properly recover from failed compilation."

parents c7aab1a9 862dadb7

graphics/java/android/renderscript/RenderScript.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

                }

libs/rs/rsScriptC.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }