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

Commit 468bb137 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add @UnsupportedAppUsage annotations"

parents f13a794b c04326d7

config/hiddenapi-light-greylist.txt

+0 −7
Original line number Diff line number Diff line
@@ -2827,13 +2827,6 @@ Landroid/nfc/INfcAdapterExtras;->getDriverName(Ljava/lang/String;)Ljava/lang/Str 
Landroid/nfc/INfcAdapterExtras;->open(Ljava/lang/String;Landroid/os/IBinder;)Landroid/os/Bundle;

Landroid/nfc/INfcAdapterExtras;->setCardEmulationRoute(Ljava/lang/String;I)V

Landroid/nfc/INfcAdapterExtras;->transceive(Ljava/lang/String;[B)Landroid/os/Bundle;

Landroid/opengl/EGL14;->eglGetDisplay(J)Landroid/opengl/EGLDisplay;

Landroid/opengl/GLES20;->glGetActiveAttrib(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V

Landroid/opengl/GLES20;->glGetActiveUniform(IIILjava/nio/IntBuffer;Ljava/nio/IntBuffer;Ljava/nio/IntBuffer;B)V

Landroid/opengl/GLSurfaceView$EglHelper;->mEglContext:Ljavax/microedition/khronos/egl/EGLContext;

Landroid/opengl/GLSurfaceView$GLThread;->mEglHelper:Landroid/opengl/GLSurfaceView$EglHelper;

Landroid/opengl/GLSurfaceView;->mGLThread:Landroid/opengl/GLSurfaceView$GLThread;

Landroid/opengl/GLSurfaceView;->mRenderer:Landroid/opengl/GLSurfaceView$Renderer;

Landroid/os/AsyncResult;->forMessage(Landroid/os/Message;)Landroid/os/AsyncResult;

Landroid/os/AsyncTask;->mFuture:Ljava/util/concurrent/FutureTask;

Landroid/os/AsyncTask;->mStatus:Landroid/os/AsyncTask$Status;

opengl/java/android/opengl/EGL14.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 


package android.opengl;



import android.annotation.UnsupportedAppUsage;

import android.graphics.SurfaceTexture;

import android.view.Surface;

import android.view.SurfaceView;
@@ -163,6 +164,7 @@ public static final int EGL_CORE_NATIVE_ENGINE = 0x305B; 
    /**

     * {@hide}

     */

    @UnsupportedAppUsage

    public static native EGLDisplay eglGetDisplay(

        long display_id

    );

opengl/java/android/opengl/GLES20.java

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 


package android.opengl;



import android.annotation.UnsupportedAppUsage;



/** OpenGL ES 2.0

 */

public class GLES20 {
@@ -824,6 +826,7 @@ public class GLES20 { 
    // C function void glGetActiveAttrib ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name )



    /** @hide Method is broken, but used to be public (b/6006380) */

    @UnsupportedAppUsage

    public static native void glGetActiveAttrib(

        int program,

        int index,
@@ -872,6 +875,7 @@ public class GLES20 { 
    // C function void glGetActiveUniform ( GLuint program, GLuint index, GLsizei bufsize, GLsizei *length, GLint *size, GLenum *type, char *name )



    /** @hide Method is broken, but used to be public (b/6006380) */

    @UnsupportedAppUsage

    public static native void glGetActiveUniform(

        int program,

        int index,

opengl/java/android/opengl/GLSurfaceView.java

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.opengl;



import android.annotation.UnsupportedAppUsage;

import android.content.Context;

import android.os.Trace;

import android.util.AttributeSet;
@@ -1235,6 +1236,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 
        EGLDisplay mEglDisplay;

        EGLSurface mEglSurface;

        EGLConfig mEglConfig;

        @UnsupportedAppUsage

        EGLContext mEglContext;



    }
@@ -1844,6 +1846,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 


        // End of member variables protected by the sGLThreadManager monitor.



        @UnsupportedAppUsage

        private EglHelper mEglHelper;



        /**
@@ -1919,7 +1922,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback 


    private final WeakReference<GLSurfaceView> mThisWeakRef =

            new WeakReference<GLSurfaceView>(this);

    @UnsupportedAppUsage

    private GLThread mGLThread;

    @UnsupportedAppUsage

    private Renderer mRenderer;

    private boolean mDetached;

    private EGLConfigChooser mEGLConfigChooser;