summaryrefslogtreecommitdiff
path: root/libs/ui/EventHub.cpp
diff options
context:
space:
mode:
author Christopher Tate <ctate@google.com> 2010-03-04 16:03:40 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-03-04 16:03:40 -0800
commit23b7aa45fbb6397d6b1960cd8f1b832ef7d49fe5 (patch)
tree34d3d3f4ca1a1b19cb27fd39c2471ae64f7b63ab /libs/ui/EventHub.cpp
parent0dc59b00f28f4d5543cf31627eeec4e913ee0785 (diff)
parent4ff7e223a9507b95ffc58a188be20217f2b3c26e (diff)
Merge "Fix #2489986 : The key bitmask needs to cover all possible keys"
Diffstat (limited to 'libs/ui/EventHub.cpp')
-rw-r--r--libs/ui/EventHub.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp
index 57192a534265..34cd9d17c2cb 100644
--- a/libs/ui/EventHub.cpp
+++ b/libs/ui/EventHub.cpp
@@ -608,7 +608,7 @@ int EventHub::open_device(const char *deviceName)
// consider up through the function keys; we don't want to include
// ones after that (play cd etc) so we don't mistakenly consider a
// controller to be a keyboard.
- uint8_t key_bitmask[(KEY_PLAYCD+1)/8];
+ uint8_t key_bitmask[(KEY_MAX+1)/8];
memset(key_bitmask, 0, sizeof(key_bitmask));
LOGV("Getting keys...");
if (ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(key_bitmask)), key_bitmask) >= 0) {