commit e42072d30cbe08651ececce06751f6a8936273b4
author Grace Kloba <klobag@google.com> Tue Jan 26 10:09:52 2010 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 26 10:09:52 2010 -0800
tree c6afb072a922fc0cc6b275b9ecb621dd62d54ea7
parent 866f0ba964c4cf7f2d09927fa57cb4f05b692cee
parent 54258c5b8bf91ddf9bb497d6f77db02987db2674

am caf0ce3c: Delay resetting mPreventDrag flags so that the Plugin will have more time to respond whether it wants to handle the touch events. (not have to return the value from WebViewCore before the first tap is up)

Merge commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62' into eclair-mr2-plus-aosp

* commit 'caf0ce3ca2b3deba4bcff6c920740bafd87f2b62':
  Delay resetting mPreventDrag flags so that the Plugin

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