commit 288fa08d80697317521fb15852385ff083d15ca7
author Jim Miller <jaggies@google.com> Fri Dec 18 16:10:31 2009 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Dec 18 16:10:31 2009 -0800
tree 935174efb7ab3e6f273573cf96df95f2f7ebb9dc
parent 82f10dff2d67464c5b21b8853f12e6191d8ab836
parent bd1865f659d94a884f0fd05d0b345c2ba5219fc7

am 05de7c88: Merge change I420cc110 into eclair-mr2

Merge commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9' into eclair-mr2-plus-aosp

* commit '05de7c882e0ae8d9ea10f4de9421b2e05bf29fa9':
  Fix 2318046: Modify PIN entry layout in keyguard so it works well on HVGA as well as WVGA devices.

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