commit 422068ab92949bc25e06c448cdbc11625fa1c559
author Eric Laurent <elaurent@google.com> Fri Jan 22 10:25:00 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 22 10:25:00 2010 -0800
tree f4d901d22f470e7d421cde73033da6a191f7db17
parent 9a6a4486c370ee867a3cf948744b5e3b0ae6fdbc
parent 17739fe71269d522ed0530e56e0633db9f95825f

am a59551ba: Merge "Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion." into eclair

Merge commit 'a59551bade6a7b0c916c277f044de79c6af1bd22' into eclair-plus-aosp

* commit 'a59551bade6a7b0c916c277f044de79c6af1bd22':
  Fix issue 2388215: Audio not routed to 3.5mm Headset after removal/insertion.

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