commit 8bb9131c663b5c4548eed1d9f964d06bccfc4da6
author Mathias Agopian <mathias@google.com> Wed Jan 19 17:01:22 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 19 17:01:22 2011 -0800
tree 4a31193b2dc14338e51de746046392b0ca1bc4aa
parent eefc82483a90f641275db3084b78c8254cc45046
parent 578b7a2265555655a8a70e8a2d621e906c9c9be0

Merge "fix [3367893] Rotating device on YouTube's home screen several times kills system_server" into honeycomb

libs/rs/rsContext.cpp

diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 2e0c491..98f30ae 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -253,7 +253,11 @@
     LOGV("%p, deinitEGL", this);
 
     if (mEGL.mContext != EGL_NO_CONTEXT) {
-        eglMakeCurrent(mEGL.mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, mEGL.mContext);
+        eglMakeCurrent(mEGL.mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        eglDestroySurface(mEGL.mDisplay, mEGL.mSurfaceDefault);
+        if (mEGL.mSurface != EGL_NO_SURFACE) {
+            eglDestroySurface(mEGL.mDisplay, mEGL.mSurface);
+        }
         eglDestroyContext(mEGL.mDisplay, mEGL.mContext);
         checkEglError("eglDestroyContext");
     }