Merge "Work around race condition when shutting down a surface flinger surface." (f7915ce8) · Commits · e / os / android_frameworks_base

opengl/java/android/opengl/GLSurfaceView.java

+17 −3

Original line number	Diff line number	Diff line
		@@ -768,6 +768,9 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
		* {@link GLSurfaceView#setEGLWindowSurfaceFactory(EGLWindowSurfaceFactory)}
		*/
		public interface EGLWindowSurfaceFactory {
		/**
		* @return null if the surface cannot be constructed.
		*/
		EGLSurface createWindowSurface(EGL10 egl, EGLDisplay display, EGLConfig config,
		Object nativeWindow);
		void destroySurface(EGL10 egl, EGLDisplay display, EGLSurface surface);
		@@ -777,7 +780,19 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback

		public EGLSurface createWindowSurface(EGL10 egl, EGLDisplay display,
		EGLConfig config, Object nativeWindow) {
		return egl.eglCreateWindowSurface(display, config, nativeWindow, null);
		EGLSurface result = null;
		try {
		result = egl.eglCreateWindowSurface(display, config, nativeWindow, null);
		} catch (IllegalArgumentException e) {
		// This exception indicates that the surface flinger surface
		// is not valid. This can happen if the surface flinger surface has
		// been torn down, but the application has not yet been
		// notified via SurfaceHolder.Callback.surfaceDestroyed.
		// In theory the application should be notified first,
		// but in practice sometimes it is not. See b/4588890
		Log.e(TAG, "eglCreateWindowSurface", e);
		}
		return result;
		}

		public void destroySurface(EGL10 egl, EGLDisplay display,
		@@ -1041,9 +1056,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
		int error = mEgl.eglGetError();
		if (error == EGL10.EGL_BAD_NATIVE_WINDOW) {
		Log.e("EglHelper", "createWindowSurface returned EGL_BAD_NATIVE_WINDOW.");
		return null;
		}
		throwEglException("createWindowSurface", error);
		return null;
		}

		/*