diff options
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 |
commit | 532c4a70d3c2d9a78990cbd7bb70864c058578ff (patch) | |
tree | 53a9ca87925a684228549f8a8efbc121945378d0 /libs/ui | |
parent | 3c5d7073c49b5daf9c025b583b20be88c526b27e (diff) | |
parent | 2032f98f8c6176be7819bd3bc4459a05542c5b85 (diff) | |
download | frameworks_native-532c4a70d3c2d9a78990cbd7bb70864c058578ff.zip frameworks_native-532c4a70d3c2d9a78990cbd7bb70864c058578ff.tar.gz frameworks_native-532c4a70d3c2d9a78990cbd7bb70864c058578ff.tar.bz2 |
Merge "Fix #2489986 : The key bitmask needs to cover all possible keys"
Diffstat (limited to 'libs/ui')
-rw-r--r-- | libs/ui/EventHub.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp index 57192a5..34cd9d1 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) { |