summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorJack Palevich <jackpal@google.com>2009-11-06 16:11:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2009-11-06 16:11:50 -0800
commit2a0bacffc1c1545a81f96d675e46bf859580f02b (patch)
treef76b787aefe1f973feae349494b8911cfd6c5fc7 /opengl
parenteefe2972495e5b07a987bf19a1ae39737ce07817 (diff)
parent4e3fadd0c99d2774709a067e017d8fd622440f0e (diff)
downloadframeworks_base-2a0bacffc1c1545a81f96d675e46bf859580f02b.zip
frameworks_base-2a0bacffc1c1545a81f96d675e46bf859580f02b.tar.gz
frameworks_base-2a0bacffc1c1545a81f96d675e46bf859580f02b.tar.bz2
am 4e3fadd0: Merge change Ia4424950 into eclair
Merge commit '4e3fadd0c99d2774709a067e017d8fd622440f0e' into eclair-plus-aosp * commit '4e3fadd0c99d2774709a067e017d8fd622440f0e': Fix stupid bug in GLThreadManager implementation.
Diffstat (limited to 'opengl')
-rw-r--r--opengl/java/android/opengl/GLSurfaceView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java
index 952eff2..ac27a2d 100644
--- a/opengl/java/android/opengl/GLSurfaceView.java
+++ b/opengl/java/android/opengl/GLSurfaceView.java
@@ -1281,8 +1281,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback
public void start(GLThread thread) throws InterruptedException {
GLThread oldThread = null;
synchronized(this) {
- mMostRecentGLThread = thread;
oldThread = mMostRecentGLThread;
+ mMostRecentGLThread = thread;
}
if (oldThread != null) {
synchronized(oldThread) {