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

* commit '93e6a48b3e876708a8161a9946581f5e8ebb382f':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
This commit is contained in:
Narayan Kamath 2014-02-27 13:23:09 +00:00 committed by Android Git Automerger
commit 3e599252c0
2 changed files with 2 additions and 3 deletions

View File

@ -14,7 +14,7 @@ static jobject
android_eglGetDisplayInt
(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");
return 0;
}

View File

@ -1,10 +1,9 @@
// C function EGLDisplay eglGetDisplay ( EGLNativeDisplayType display_id )
// TODO Deprecate the eglGetDisplay(int) API method
public static native EGLDisplay eglGetDisplay(
int display_id
);
// TODO Unhide the eglGetDisplay(long) API method
/**
* {@hide}
*/