diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-27 13:33:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-27 13:33:23 +0000 |
| commit | e5f98941bad09f797329aeec090177e1da17220e (patch) | |
| tree | e8be91d68af2366e5766bf870cb3091d6689dbe5 /opengl/java | |
| parent | a393735a5d637d211713b2b580bdd16f8eba2f7d (diff) | |
| parent | 7aec4109c53371e69bec111c69767810f45c301c (diff) | |
| download | frameworks_base-e5f98941bad09f797329aeec090177e1da17220e.zip frameworks_base-e5f98941bad09f797329aeec090177e1da17220e.tar.gz frameworks_base-e5f98941bad09f797329aeec090177e1da17220e.tar.bz2 | |
am 7aec4109: am 7aeb4307: am 2525acf5: am e4dae5f2: Merge "AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY"
* commit '7aec4109c53371e69bec111c69767810f45c301c':
AArch64: Make eglGetDisplay(int) work for EGL_DEFAULT_DISPLAY
Diffstat (limited to 'opengl/java')
| -rw-r--r-- | opengl/java/android/opengl/EGL14.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/opengl/java/android/opengl/EGL14.java b/opengl/java/android/opengl/EGL14.java index b6dd9c2..cf09c58 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} */ |