commit 82fe43131cd60bb5bf64258ded99de08ad3dc6f2
author Grace Kloba <klobag@google.com> Wed Jan 20 23:26:03 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 20 23:26:03 2010 -0800
tree f4d901d22f470e7d421cde73033da6a191f7db17
parent 7c360aaf6cd95ec8cce8f97c4a314114951c1cbb
parent 1a01fad3c3bc855bdfcaae462176ba91968b9d5a

am d5ada83c: ScaleGestureDetector needs to query the displaymetrics for the width/height on each touch down as orientation can change.

Merge commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b' into eclair-plus-aosp

* commit 'd5ada83c719d366d3063572ca6ce5ab8918fd39b':
  ScaleGestureDetector needs to query the displaymetrics

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