diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-27 13:18:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-27 13:18:07 +0000 |
| commit | e4dae5f2c26f5992a31f8ce15811fc082647ddb8 (patch) | |
| tree | 15e524b4c187326ab304273f07e99952094497ec /core | |
| parent | 2000fe58332dffaad34c618fe35840992cb0f571 (diff) | |
| parent | 64d38d9f4863f6e9434e6820b924eb958e8a2230 (diff) | |
| download | frameworks_base-e4dae5f2c26f5992a31f8ce15811fc082647ddb8.zip frameworks_base-e4dae5f2c26f5992a31f8ce15811fc082647ddb8.tar.gz frameworks_base-e4dae5f2c26f5992a31f8ce15811fc082647ddb8.tar.bz2 | |
Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_opengl_EGL14.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_opengl_EGL14.cpp b/core/jni/android_opengl_EGL14.cpp index bf65dfc..19e4d99 100644 --- a/core/jni/android_opengl_EGL14.cpp +++ b/core/jni/android_opengl_EGL14.cpp @@ -156,7 +156,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; } |