commit a209aa866e5f1101064896c618e5d36cbce48470
author Kenny Root <kroot@google.com> Thu Oct 21 17:21:56 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 21 17:21:56 2010 -0700
tree 8fa5d7d4439a70c22fa5815b29f6cefdbfc0a893
parent 1e207d67fb21c1e33f70b471150c2629759873ba
parent bd3f24e7f1043fd04204b94f32136829d0c96514

am d7cd560a: am 1d79a9d9: Use correct size of GAMEPAD_KEYCODES

Merge commit 'd7cd560af506f75d07034c136bea09b409b4d408'

* commit 'd7cd560af506f75d07034c136bea09b409b4d408':
  Use correct size of GAMEPAD_KEYCODES

libs/ui/EventHub.cpp

diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp
index 97a7528..bc08e0a 100644
--- a/libs/ui/EventHub.cpp
+++ b/libs/ui/EventHub.cpp
@@ -839,7 +839,7 @@
         }
 
         // See if this device has a gamepad.
-        for (size_t i = 0; i < sizeof(GAMEPAD_KEYCODES); i++) {
+        for (size_t i = 0; i < sizeof(GAMEPAD_KEYCODES)/sizeof(GAMEPAD_KEYCODES[0]); i++) {
             if (hasKeycodeLocked(device, GAMEPAD_KEYCODES[i])) {
                 device->classes |= INPUT_DEVICE_CLASS_GAMEPAD;
                 break;