summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2011-01-18 15:53:25 -0800
committerJack Palevich <jackpal@google.com>2011-01-18 15:53:25 -0800
commit75f2bc04df11c67d7074186432278f182381b9f2 (patch)
tree58f2f597517fc95e93ea1030987feca5ebf0a0eb
parent1418de7eff012c37cf34328eb368a547d70a1441 (diff)
downloadframeworks_base-75f2bc04df11c67d7074186432278f182381b9f2.zip
frameworks_base-75f2bc04df11c67d7074186432278f182381b9f2.tar.gz
frameworks_base-75f2bc04df11c67d7074186432278f182381b9f2.tar.bz2
Unhide GLSurfaceView.get/setPreserveEGLContextOnPause
Change-Id: I882b8fa7888e2baae41c81b75af7fc1f639d38d6
-rw-r--r--api/current.xml24
-rw-r--r--opengl/java/android/opengl/GLSurfaceView.java2
2 files changed, 24 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml
index 4f566f6..e21094e 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -136088,6 +136088,17 @@
visibility="public"
>
</method>
+<method name="getPreserveEGLContextOnPause"
+ return="boolean"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</method>
<method name="getRenderMode"
return="int"
abstract="false"
@@ -136259,6 +136270,19 @@
<parameter name="glWrapper" type="android.opengl.GLSurfaceView.GLWrapper">
</parameter>
</method>
+<method name="setPreserveEGLContextOnPause"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="preserveOnPause" type="boolean">
+</parameter>
+</method>
<method name="setRenderMode"
return="void"
abstract="false"
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index 4099c4c..32d1a23 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -272,7 +272,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
}
/**
- * @hide
* Control whether the EGL context is preserved when the GLSurfaceView is paused and
* resumed.
* <p>
@@ -295,7 +294,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
}
/**
- * @hide
* @return true if the EGL context will be preserved when paused
*/
public boolean getPreserveEGLContextOnPause() {