summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-04-16 13:21:53 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-16 13:21:53 -0700
commitd1661dcc90cb3efcad75e3fda778f3592bfc5b04 (patch)
treef3fa0a122cc7e4a9e67742c91e7f3c4eafb03f38 /graphics
parent70544533aec6b318ff1687c9eec0cb9e86ce1b1a (diff)
parent33efb231cb92065c40c019319adae36abc413863 (diff)
downloadframeworks_base-d1661dcc90cb3efcad75e3fda778f3592bfc5b04.zip
frameworks_base-d1661dcc90cb3efcad75e3fda778f3592bfc5b04.tar.gz
frameworks_base-d1661dcc90cb3efcad75e3fda778f3592bfc5b04.tar.bz2
Merge "Unhide new SurfaceTexture & TextureView APIs"
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/SurfaceTexture.java6
1 files changed, 1 insertions, 5 deletions
diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java
index 3fc20b5..4beaecd 100644
--- a/graphics/java/android/graphics/SurfaceTexture.java
+++ b/graphics/java/android/graphics/SurfaceTexture.java
@@ -159,7 +159,7 @@ public class SurfaceTexture {
* It will implicitly bind its texture to the GL_TEXTURE_EXTERNAL_OES texture target.
*/
public void updateTexImage() {
- nativeUpdateTexImage();
+ nativeUpdateTexImage();
}
/**
@@ -172,8 +172,6 @@ public class SurfaceTexture {
* This can be used to access the SurfaceTexture image contents from multiple OpenGL ES
* contexts. Note, however, that the image contents are only accessible from one OpenGL ES
* context at a time.
- *
- * @hide
*/
public void detachFromGLContext() {
int err = nativeDetachFromGLContext();
@@ -194,8 +192,6 @@ public class SurfaceTexture {
*
* @param texName The name of the OpenGL ES texture that will be created. This texture name
* must be unusued in the OpenGL ES context that is current on the calling thread.
- *
- * @hide
*/
public void attachToGLContext(int texName) {
int err = nativeAttachToGLContext(texName);