Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix incorrect JNI_ABORT" into lmp-dev

Browse Source
This commit is contained in:
Mathieu Chartier
2014-10-06 20:27:07 +00:00
committed by Android (Google) Code Review
parent 17d7c79650 6a5e6df968
commit 1638a0049b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/jni/com_google_android_gles_jni_EGLImpl.cpp
View File

@@ -115,7 +115,7 @@ static jint* beginNativeAttribList(JNIEnv *_env, jintArray attrib_list) {
static void endNativeAttributeList(JNIEnv *_env, jintArray attrib_list, jint* attrib_base) {
if (attrib_list != NULL) {
_env->ReleaseIntArrayElements(attrib_list, attrib_base, JNI_ABORT);
_env->ReleaseIntArrayElements(attrib_list, attrib_base, 0);
}
}
@@ -136,7 +136,7 @@ static jboolean jni_eglInitialize(JNIEnv *_env, jobject _this, jobject display,
jint* base = (jint *)_env->GetPrimitiveArrayCritical(major_minor, (jboolean *)0);
if (len >= 1) base[0] = 1;
if (len >= 2) base[1] = 0;
_env->ReleasePrimitiveArrayCritical(major_minor, base, JNI_ABORT);
_env->ReleasePrimitiveArrayCritical(major_minor, base, 0);
}
}
return EglBoolToJBool(success);
@@ -156,7 +156,7 @@ static jboolean jni_eglQueryContext(JNIEnv *_env, jobject _this, jobject display
if (len) {
jint* base = _env->GetIntArrayElements(value, (jboolean *)0);
success = eglQueryContext(dpy, ctx, attribute, base);
_env->ReleaseIntArrayElements(value, base, JNI_ABORT);
_env->ReleaseIntArrayElements(value, base, 0);
}
return EglBoolToJBool(success);
}
@@ -176,7 +176,7 @@ static jboolean jni_eglQuerySurface(JNIEnv *_env, jobject _this, jobject display
if (len) {
jint* base = _env->GetIntArrayElements(value, (jboolean *)0);
success = eglQuerySurface(dpy, sur, attribute, base);
_env->ReleaseIntArrayElements(value, base, JNI_ABORT);
_env->ReleaseIntArrayElements(value, base, 0);
}
return EglBoolToJBool(success);
}