commit 4d10a98008613b84aedbdd2843002df84e8df096
author Charles Chen <clchen@google.com> Tue Dec 22 17:42:25 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 22 17:42:25 2009 -0800
tree c6afb072a922fc0cc6b275b9ecb621dd62d54ea7
parent 1c6d5ecde61a5c7ab0d7c9ade1631de5a80981d4
parent 13fc5a45d97fb4ab77afff014c5ed2557d137b02

am 4bc95d19: Merge change Iab089078 into eclair-mr2

Merge commit '4bc95d19c9ccf9cfe4c51b1e697db8cc1d86a579' into eclair-mr2-plus-aosp

* commit '4bc95d19c9ccf9cfe4c51b1e697db8cc1d86a579':
  Fix for a race condition that can occur if an utterance

opengl/libagl/egl.cpp

diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp
index 781b8c3..81864bd 100644
--- a/opengl/libagl/egl.cpp
+++ b/opengl/libagl/egl.cpp
@@ -1205,7 +1205,7 @@
                 gConfigManagement,
                 0, NELEM(gConfigManagement)-1,
                 attr);
-        if (index >= 0) {
+        if (cfgMgtIndex >= 0) {
             bool match = gConfigManagement[cfgMgtIndex].match(
                     val, configFound[index].value);
             if (match) {