Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30420d58 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android Git Automerger
Browse files

am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY" 

* commit '2525acf5':
  AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
parents 9a25b944 2525acf5

core/jni/android_opengl_EGL14.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −2
Original line number Diff line number Diff line
@@ -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}

     */