From 1801b180dac364a25ef12a5af01ce0bb5a74a601 Mon Sep 17 00:00:00 2001
From: Narayan Kamath <narayan@google.com>
Date: Thu, 27 Feb 2014 14:09:53 +0000
Subject: API changes for 64 bit platforms.

EGLObjectHandle.<init>(int) and int EGLObjectHandle.getHandle()
have now been deprecated and replaced with variants that take
and return java longs.

bug: 13181704
Change-Id: I67bef5fbf064e85205b8a85e00f91f4ffcf60d19
---
 opengl/java/android/opengl/EGLObjectHandle.java | 29 ++++++++++++-------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'opengl/java')

diff --git a/opengl/java/android/opengl/EGLObjectHandle.java b/opengl/java/android/opengl/EGLObjectHandle.java
index e6e3976..113f867 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;
-- 
cgit v1.1