resolved conflicts for merge of 4e3fadd0 to eclair-mr2 (a3a351e5) · Commits · e / os / android_frameworks_base

opengl/java/android/opengl/GLSurfaceView.java

+8 −7

Original line number	Diff line number	Diff line
		@@ -1299,9 +1299,16 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback

		GLThread oldThread = null;
		synchronized(this) {
		mMostRecentGLThread = thread;
		oldThread = mMostRecentGLThread;
		mMostRecentGLThread = thread;
		}
		if (oldThread != null && ! mMultipleGLESContextsAllowed) {
		synchronized(oldThread) {
		oldThread.notifyAll();
		}
		}

		synchronized(this) {
		while ((! mMultipleGLESContextsAllowed)
		&& mGLContextCount > 0) {
		wait();
		@@ -1309,12 +1316,6 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback

		mGLContextCount++;
		}

		if (oldThread != null && ! mMultipleGLESContextsAllowed) {
		synchronized(oldThread) {
		oldThread.notifyAll();
		}
		}
		}

		public synchronized void end(GLThread thread) {