commit f4b322801d872b64f6c7dd2d2ffc1e4f8e993eef
author Daniel Lam <dalam@google.com> Wed Apr 18 21:29:19 2012 -0700
committer Mathias Agopian <mathias@google.com> Tue Apr 24 17:25:00 2012 -0700
tree 075064dca4cbee6bf868c1a3cd0e466810771959
parent 2488b20aec097accb20a853d9876bb0a5dc04636

SurfaceTexture: detachFromContext fixed

Fixed AttachToContextSucceeds test SurfaceTexture test by
not deleting the current texture when cleaning up memory.

Bug: 6363186
Change-Id: Ib886bfe6bb86e25ea4825d18b5008afba6b33eae

libs/gui/SurfaceTexture.cpp

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 6562a94..8141227 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -351,7 +351,7 @@
     // new EGLDisplay).
     for (int i =0; i < BufferQueue::NUM_BUFFER_SLOTS; i++) {
         EGLImageKHR img = mEGLSlots[i].mEglImage;
-        if (img != EGL_NO_IMAGE_KHR) {
+        if (img != EGL_NO_IMAGE_KHR && i != mCurrentTexture) {
             eglDestroyImageKHR(mEglDisplay, img);
             mEGLSlots[i].mEglImage = EGL_NO_IMAGE_KHR;
         }