Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1801b180 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

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
parent e5f98941
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -16310,8 +16310,10 @@ package android.opengl {
  }
  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 {
+14 −15
Original line number Diff line number Diff line
@@ -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;