summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2014-02-27 13:26:39 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-02-27 13:26:39 +0000
commit7aeb43072a9fb9b0a7078a390cb4a729321bf117 (patch)
tree2a81fee494d4df7914acec8795103b1a7a2584b2 /opengl/java
parent9fc8e6fe8f6c89f5ebcda4b569cab10988e1fa3f (diff)
parent2525acf5a9855d748c008268bb26d6f6d5045d84 (diff)
am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '2525acf5a9855d748c008268bb26d6f6d5045d84': AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Diffstat (limited to 'opengl/java')
-rw-r--r--opengl/java/android/opengl/EGL14.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java
index b6dd9c25667e..cf09c5865b98 100644
--- a/opengl/java/android/opengl/EGL14.java
+++ b/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}
*/