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

* commit 'abdaa32dd79c915d0e419560c8eaa64e3d946b77':
  Fix bug in passing of context flags and version.

1 files changed, 2 insertions, 2 deletions

diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index b46058e7bc29..68a0b8387766 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -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