diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:43 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:43 -0800 |
| commit | f013e1afd1e68af5e3b868c26a653bbfb39538f8 (patch) | |
| tree | 7ad6c8fd9c7b55f4b4017171dec1cb760bbd26bf /core/jni/com_google_android_gles_jni_EGLImpl.cpp | |
| parent | e70cfafe580c6f2994c4827cd8a534aabf3eb05c (diff) | |
| download | frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.zip frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.tar.gz frameworks_base-f013e1afd1e68af5e3b868c26a653bbfb39538f8.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'core/jni/com_google_android_gles_jni_EGLImpl.cpp')
| -rw-r--r-- | core/jni/com_google_android_gles_jni_EGLImpl.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index af03016..a985c24 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -332,12 +332,8 @@ jboolean jni_eglGetConfigs(JNIEnv *_env, jobject _this, jobject display, if (success && configs) { for (int i=0 ; i<num ; i++) { - jobject obj = _env->GetObjectArrayElement(configs, i); - if (obj == NULL) { - doThrow(_env, "java/lang/NullPointerException"); - break; - } - _env->SetIntField(obj, gConfig_EGLConfigFieldID, (jint)nativeConfigs[i]); + jobject obj = _env->NewObject(gConfig_class, gConfig_ctorID, (jint)nativeConfigs[i]); + _env->SetObjectArrayElement(configs, i, obj); } } return success; @@ -396,8 +392,7 @@ jboolean jni_eglMakeCurrent(JNIEnv *_env, jobject _this, jobject display, jobjec jstring jni_eglQueryString(JNIEnv *_env, jobject _this, jobject display, jint name) { EGLDisplay dpy = getDisplay(_env, display); const char* chars = eglQueryString(dpy, name); - return _env->NewString((const jchar *)chars, - (jsize)strlen((const char *)chars)); + return _env->NewStringUTF(chars); } jboolean jni_eglSwapBuffers(JNIEnv *_env, jobject _this, jobject display, jobject surface) { |