From: Daniel Lam <dalam@google.com>
Date: Thu, 19 Apr 2012 04:29:19 +0000 (-0700)
Subject: SurfaceTexture: detachFromContext fixed
X-Git-Tag: android-x86-4.4-r1~939
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f4b322801d872b64f6c7dd2d2ffc1e4f8e993eef;p=android-x86%2Fframeworks-native.git

SurfaceTexture: detachFromContext fixed

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

Bug: 6363186
Change-Id: Ib886bfe6bb86e25ea4825d18b5008afba6b33eae
---

diff --git a/libs/gui/SurfaceTexture.cpp b/libs/gui/SurfaceTexture.cpp
index 6562a94bba..8141227f8e 100644
--- a/libs/gui/SurfaceTexture.cpp
+++ b/libs/gui/SurfaceTexture.cpp
@@ -351,7 +351,7 @@ status_t SurfaceTexture::detachFromContext() {
     // 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;
         }