diff options
author | Jamie Gennis <jgennis@google.com> | 2012-08-20 12:39:37 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-20 12:39:38 -0700 |
commit | 220ef10c5fe44df0ff3898de06028975995a34e4 (patch) | |
tree | 394efdb66a1b5b0e4f33f402d4386fd202587c0d /libs | |
parent | d3bbcaff6f0e08db0412d92f42562a2826a58bec (diff) | |
parent | f8d33c652b930abbfb0722f3a2928cbc2ea71078 (diff) | |
download | frameworks_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.cpp | 1 |
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() { |