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

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;
     }

opengl/java/android/opengl/EGL14.java

@@ -155,12 +155,11 @@ public static final int EGL_CORE_NATIVE_ENGINE             = 0x305B;
     );
 
     // 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}
      */