drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 723218b4: Merge "Hide ManagedEGLContext until we are sure this is the correct API." into ics-mr1

Browse Source 
* commit '723218b4f428944bdb11b25d0b30ece56283f696':
  Hide ManagedEGLContext until we are sure this is the correct API.
This commit is contained in:
Romain Guy
2011-11-21 21:20:57 -08:00
committed by Android Git Automerger
parent d0a254566f 723218b4f4
commit ea54d0dc0d
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
api/current.txt
View File

@ -14243,13 +14243,6 @@ package android.opengl {
method public static void texSubImage2D(int, int, int, int, android.graphics.Bitmap, int, int); method public static void texSubImage2D(int, int, int, int, android.graphics.Bitmap, int, int);
} }
public abstract class ManagedEGLContext {
ctor public ManagedEGLContext(javax.microedition.khronos.egl.EGLContext);
method public javax.microedition.khronos.egl.EGLContext getContext();
method public abstract void onTerminate(javax.microedition.khronos.egl.EGLContext);
method public void terminate();
}
public class Matrix { public class Matrix {
ctor public Matrix(); ctor public Matrix();
method public static void frustumM(float[], int, float, float, float, float, float, float); method public static void frustumM(float[], int, float, float, float, float, float, float);
@ -18432,14 +18425,14 @@ package android.renderscript {
ctor public RSSurfaceView(android.content.Context); ctor public RSSurfaceView(android.content.Context);
ctor public RSSurfaceView(android.content.Context, android.util.AttributeSet); ctor public RSSurfaceView(android.content.Context, android.util.AttributeSet);
method public android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig); method public android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig);
method public synchronized void destroyRenderScriptGL(); method public void destroyRenderScriptGL();
method public android.renderscript.RenderScriptGL getRenderScriptGL(); method public android.renderscript.RenderScriptGL getRenderScriptGL();
method public void pause(); method public void pause();
method public void resume(); method public void resume();
method public void setRenderScriptGL(android.renderscript.RenderScriptGL); method public void setRenderScriptGL(android.renderscript.RenderScriptGL);
method public synchronized void surfaceChanged(android.view.SurfaceHolder, int, int, int); method public void surfaceChanged(android.view.SurfaceHolder, int, int, int);
method public void surfaceCreated(android.view.SurfaceHolder); method public void surfaceCreated(android.view.SurfaceHolder);
method public synchronized void surfaceDestroyed(android.view.SurfaceHolder); method public void surfaceDestroyed(android.view.SurfaceHolder);
} }
public class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener { public class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener {

2
opengl/java/android/opengl/ManagedEGLContext.java
View File

@ -43,6 +43,8 @@ import com.google.android.gles_jni.EGLImpl;
* of the currently created EGL contexts in the process are being managed * of the currently created EGL contexts in the process are being managed
* through this class, then they will all be asked to terminate through the * through this class, then they will all be asked to terminate through the
* call to {@link #onTerminate}. * call to {@link #onTerminate}.
*
* @hide
*/ */
public abstract class ManagedEGLContext { public abstract class ManagedEGLContext {
static final String TAG = "ManagedEGLContext"; static final String TAG = "ManagedEGLContext";