Merge "API changes for 64 bit platforms."
diff --git a/api/current.txt b/api/current.txt
index 5ef4373..23bbdba 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -16328,8 +16328,10 @@
}
public abstract class EGLObjectHandle {
- ctor protected EGLObjectHandle(int);
- method public int getHandle();
+ ctor protected deprecated EGLObjectHandle(int);
+ ctor protected EGLObjectHandle(long);
+ method public deprecated int getHandle();
+ method public long getNativeHandle();
}
public class EGLSurface extends android.opengl.EGLObjectHandle {
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,18 +24,28 @@
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()
+ /**
+ * @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;
+ }
/**
* Returns the native handle of the wrapped EGL object. This handle can be
* cast to the corresponding native type on the native side.
@@ -44,17 +54,6 @@
*
* @return the native handle of the wrapped EGL object.
*/
- public int getHandle() {
- if ((mHandle & 0xffffffffL) != mHandle) {
- throw new UnsupportedOperationException();
- }
- return (int)mHandle;
- }
-
- // TODO Unhide getNativeHandle() method
- /**
- * {@hide}
- */
public long getNativeHandle() {
return mHandle;
}