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

This commit is contained in:
Mathias Agopian
2011-01-19 17:01:22 -08:00
committed by Android (Google) Code Review

View File

@@ -253,7 +253,11 @@ void Context::deinitEGL() {
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");
}