summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-11-08 16:15:26 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-08 16:15:26 -0800
commitd211b4882a662409b85a1f90c71e28faa9c54464 (patch)
tree6e9dc3e95cd2aa953c2b7b8f1ae9673d93f3c657 /api
parent911263dc5df48b89e8f9010fb74dfe2649bdc442 (diff)
parent2aafe742e5d2d63d77c49df032ec580966661597 (diff)
downloadframeworks_base-d211b4882a662409b85a1f90c71e28faa9c54464.zip
frameworks_base-d211b4882a662409b85a1f90c71e28faa9c54464.tar.gz
frameworks_base-d211b4882a662409b85a1f90c71e28faa9c54464.tar.bz2
Merge "SurfaceTexture: unhide setDefaultBufferSize" into ics-mr1
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 5c830d4..d83659f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -8797,6 +8797,7 @@ package android.graphics {
method public long getTimestamp();
method public void getTransformMatrix(float[]);
method public void release();
+ method public void setDefaultBufferSize(int, int);
method public void setOnFrameAvailableListener(android.graphics.SurfaceTexture.OnFrameAvailableListener);
method public void updateTexImage();
}