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

Commit 22f07f89 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Fix Allocation-less launches" into mnc-dev

parents a0511081 d1516dff

rs/java/android/renderscript/Script.java

+2 −2
Original line number Diff line number Diff line
@@ -182,9 +182,9 @@ public class Script extends BaseObj { 
        mRS.validateObject(ain);

        mRS.validateObject(aout);



        if (ain == null && aout == null) {

        if (ain == null && aout == null && sc == null) {

            throw new RSIllegalArgumentException(

                "At least one of ain or aout is required to be non-null.");

                "At least one of input allocation, output allocation, or LaunchOptions is required to be non-null.");

        }



        long[] in_ids = null;

rs/jni/android_renderscript_RenderScript.cpp

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



#define LOG_TAG "libRS_jni"

#define LOG_TAG "RenderScript_jni"



#include <stdlib.h>

#include <stdio.h>
@@ -1857,7 +1857,7 @@ nScriptForEach(JNIEnv *_env, jobject _this, jlong con, jlong script, jint slot, 
               jintArray limits)

{

    if (kLogApi) {

        ALOGD("nScriptForEach, con(%p), s(%p), slot(%i)", (RsContext)con, (void *)script, slot);

        ALOGD("nScriptForEach, con(%p), s(%p), slot(%i) ains(%p) aout(%lli)", (RsContext)con, (void *)script, slot, ains, aout);

    }



    jint   in_len = 0;