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

* commit 'ea54d0dc0dfeef5560fea04667804413d522025f':
  Hide ManagedEGLContext until we are sure this is the correct API.

2 files changed, 5 insertions, 10 deletions

diff --git a/api/current.txt b/api/current.txt
index 62291f7..4cf23eb 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14244,13 +14244,6 @@ package android.opengl {
     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 {
     ctor public Matrix();
     method public static void frustumM(float[], int, float, float, float, float, float, float);
@@ -18434,14 +18427,14 @@ package android.renderscript {
     ctor public RSSurfaceView(android.content.Context);
     ctor public RSSurfaceView(android.content.Context, android.util.AttributeSet);
     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 void pause();
     method public void resume();
     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 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 {
diff --git a/opengl/java/android/opengl/ManagedEGLContext.java b/opengl/java/android/opengl/ManagedEGLContext.java
index 1eafbca..61fa565 100644
--- a/opengl/java/android/opengl/ManagedEGLContext.java
+++ b/opengl/java/android/opengl/ManagedEGLContext.java
@@ -43,6 +43,8 @@ import com.google.android.gles_jni.EGLImpl;
  * 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
  * call to {@link #onTerminate}.
+ * 
+ * @hide
  */
 public abstract class ManagedEGLContext {
     static final String TAG = "ManagedEGLContext";