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

Commit 7048518e authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am 233d700e: am b940599a: am abdaa32d: Merge "Fix bug in passing of context flags and version." 

* commit '233d700e':
  Fix bug in passing of context flags and version.
parents 07497559 233d700e

rs/jni/android_renderscript_RenderScript.cpp

+2 −2
Original line number Diff line number Diff line
@@ -258,12 +258,12 @@ nDeviceSetConfig(JNIEnv *_env, jobject _this, jlong dev, jint p, jint value) 
}



static jlong

nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint ver, jint sdkVer, jint ct)

nContextCreate(JNIEnv *_env, jobject _this, jlong dev, jint flags, jint sdkVer, jint contextType)

{

    if (kLogApi) {

        ALOGD("nContextCreate");

    }

    return (jlong)(uintptr_t)rsContextCreate((RsDevice)dev, ver, sdkVer, (RsContextType)ct, 0);

    return (jlong)(uintptr_t)rsContextCreate((RsDevice)dev, 0, sdkVer, (RsContextType)contextType, flags);

}



static jlong