am d6e9e61c: Merge "Fix bug in passing of context flags and version." into lmp-mr1-dev

* commit 'd6e9e61c9d9b7ba88ae7ade0418e17a3ac2ef341':
  Fix bug in passing of context flags and version.
This commit is contained in:
Jason Sams
2014-12-03 02:19:00 +00:00
committed by Android Git Automerger

View File

@@ -240,10 +240,10 @@ nDeviceSetConfig(JNIEnv *_env, jobject _this, jlong dev, jint p, jint value)
} }
static jlong 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)
{ {
LOG_API("nContextCreate"); LOG_API("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 static jlong