summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceTexture.cpp
diff options
context:
space:
mode:
author Jamie Gennis <jgennis@google.com> 2011-02-02 16:21:24 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2011-02-02 16:21:24 -0800
commita257be1895218e5c3e153313db9dd703fd9cc84f (patch)
tree457726588b7e414388795ed24f1c38a67dc96dd6 /libs/gui/SurfaceTexture.cpp
parent9d3fb3717f2acec71a3330e448ecf63ee997b1f8 (diff)
parent421d94c20321e1de528416b279bf148baba47b39 (diff)
am 421d94c2: am ecb4b3f0: Merge "Pass the IGraphicBufferAlloc to SurfaceTextureClient." into honeycomb
* commit '421d94c20321e1de528416b279bf148baba47b39': Pass the IGraphicBufferAlloc to SurfaceTextureClient.
Diffstat (limited to 'libs/gui/SurfaceTexture.cpp')
-rw-r--r--libs/gui/SurfaceTexture.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 236ff4fd14b4..6466f2b3867d 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -312,6 +312,11 @@ void SurfaceTexture::setFrameAvailableListener(
mFrameAvailableListener = l;
}
+sp<IBinder> SurfaceTexture::getAllocator() {
+ LOGV("SurfaceTexture::getAllocator");
+ return mGraphicBufferAlloc->asBinder();
+}
+
void SurfaceTexture::freeAllBuffers() {
for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {
mSlots[i].mGraphicBuffer = 0;