Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 4e3fadd0 to eclair-mr2

Browse Source
This commit is contained in:
Jack Palevich
2009-11-06 16:35:19 -08:00
parent f6ff2be323 4e3fadd0c9
commit a3a351e5d1
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
opengl/java/android/opengl/GLSurfaceView.java
View File

@@ -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) {