commit 57bb82bdc46237d3838d23037f15f5da1c8727c6
author Jaikumar Ganesh <jaikumar@google.com> Mon Jan 11 14:20:53 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Jan 11 14:20:53 2010 -0800
tree 02e006c44a49085c3359169c33b2dcaed4d96203
parent 752eae6149e9cc539b1d58d87f6cce0e61559a59
parent 216cb739d8910b73d13321d09a2ed028692662a3

am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.

Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.

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