summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2012-08-20 12:39:37 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-20 12:39:38 -0700
commit220ef10c5fe44df0ff3898de06028975995a34e4 (patch)
tree394efdb66a1b5b0e4f33f402d4386fd202587c0d /libs
parentd3bbcaff6f0e08db0412d92f42562a2826a58bec (diff)
parentf8d33c652b930abbfb0722f3a2928cbc2ea71078 (diff)
downloadframeworks_native-220ef10c5fe44df0ff3898de06028975995a34e4.zip
frameworks_native-220ef10c5fe44df0ff3898de06028975995a34e4.tar.gz
frameworks_native-220ef10c5fe44df0ff3898de06028975995a34e4.tar.bz2
Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
Diffstat (limited to 'libs')
-rw-r--r--libs/gui/SurfaceTexture.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 451ccc2..0579a3d 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -710,6 +710,7 @@ void SurfaceTexture::freeBufferLocked(int slotIndex) {
eglDestroyImageKHR(mEglDisplay, img);
}
mEglSlots[slotIndex].mEglImage = EGL_NO_IMAGE_KHR;
+ ConsumerBase::freeBufferLocked(slotIndex);
}
void SurfaceTexture::abandonLocked() {