commit d79d737cb647e072e1c9122a128983e886af7f77
author Jaikumar Ganesh <jaikumar@google.com> Tue Nov 17 17:40:45 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 17 17:40:45 2009 -0800
tree 6164c16a6158066e40e9dff21a183bd28f662d14
parent 1a57b289749c828643f7f3801edca3e007c65fbf
parent 7c7e00fca6fd814fa055a2cea729638cadb25e87

am 4fea2919: am 660282dc: Merge change I706fe6b0 into eclair

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

* commit '4fea2919abeba149376fed98a14e3ffc8464eadf':
  Check if Bluetooth is enabled before making any calls down.

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