Merge "API changes for 64 bit platforms."

1 files changed, 14 insertions, 15 deletions

diff --git a/opengl/java/android/opengl/EGLObjectHandle.java b/opengl/java/android/opengl/EGLObjectHandle.java
index e6e397602def..113f867c404f 100644
--- a/opengl/java/android/opengl/EGLObjectHandle.java
+++ b/opengl/java/android/opengl/EGLObjectHandle.java
@@ -24,36 +24,35 @@ package android.opengl;
 public abstract class EGLObjectHandle {
     private final long mHandle;
 
-    // TODO Deprecate EGLObjectHandle(int) method
+    /**
+     * @deprecated Use {@link EGLObjectHandle(long)} instead. Handles
+     *     on 64 bit platforms will be wider than java ints.
+     */
+    @Deprecated
     protected EGLObjectHandle(int handle) {
         mHandle = handle;
     }
-    // TODO Unhide the EGLObjectHandle(long) method
-    /**
-     * {@hide}
-     */
     protected EGLObjectHandle(long handle) {
         mHandle = handle;
     }
-    // TODO Deprecate getHandle() method in favor of getNativeHandle()
     /**
-     * Returns the native handle of the wrapped EGL object. This handle can be
-     * cast to the corresponding native type on the native side.
-     *
-     * For example, EGLDisplay dpy = (EGLDisplay)handle;
-     *
-     * @return the native handle of the wrapped EGL object.
+     * @deprecated Use {@link #getNativeHandle()} instead. Handles on
+     *     64 bit platforms will be wider than java ints.
      */
+    @Deprecated
     public int getHandle() {
         if ((mHandle & 0xffffffffL) != mHandle) {
             throw new UnsupportedOperationException();
         }
         return (int)mHandle;
     }
-
-    // TODO Unhide getNativeHandle() method
     /**
-     * {@hide}
+     * Returns the native handle of the wrapped EGL object. This handle can be
+     * cast to the corresponding native type on the native side.
+     *
+     * For example, EGLDisplay dpy = (EGLDisplay)handle;
+     *
+     * @return the native handle of the wrapped EGL object.
      */
     public long getNativeHandle() {
         return mHandle;