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

Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"

Browse Source
This commit is contained in:
Narayan Kamath
2014-02-27 13:18:06 +00:00
committed by Gerrit Code Review
parent 2000fe5833 64d38d9f48
commit e4dae5f2c2
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_opengl_EGL14.cpp
View File

@@ -156,7 +156,7 @@ static jobject
android_eglGetDisplayInt android_eglGetDisplayInt
(JNIEnv *_env, jobject _this, jint display_id) { (JNIEnv *_env, jobject _this, jint display_id) {
if (sizeof(void*) != sizeof(uint32_t)) { if ((EGLNativeDisplayType)display_id != EGL_DEFAULT_DISPLAY) {
jniThrowException(_env, "java/lang/UnsupportedOperationException", "eglGetDisplay"); jniThrowException(_env, "java/lang/UnsupportedOperationException", "eglGetDisplay");
return 0; return 0;
} }

3
opengl/java/android/opengl/EGL14.java
View File

@@ -155,12 +155,11 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B;
); );
// C function EGLDisplay eglGetDisplay ( EGLNativeDisplayType display_id ) // C function EGLDisplay eglGetDisplay ( EGLNativeDisplayType display_id )
// TODO Deprecate the eglGetDisplay(int) API method
public static native EGLDisplay eglGetDisplay( public static native EGLDisplay eglGetDisplay(
int display_id int display_id
); );
// TODO Unhide the eglGetDisplay(long) API method
/** /**
* {@hide} * {@hide}
*/ */