summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Albert <danalbert@google.com>2014-09-10 17:31:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-09-10 17:31:55 +0000
commit8bbc526921a5034ccde19e5ae5ec4d5b0cc180ee (patch)
tree43be3bd5e2273fb320beea455e2f6c9d2d109aef
parent8085477fb98eab36bbc8c3e9add76f398235b469 (diff)
parent4fb58b0360fec97624992ec0e4e20a4df0aa5317 (diff)
downloadbase-8bbc526921a5034ccde19e5ae5ec4d5b0cc180ee.tar.gz
Merge "Don't check a staticly allocated array for null."
-rw-r--r--services/input/EventHub.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/input/EventHub.cpp b/services/input/EventHub.cpp
index a302cd2dea85..bf979d4a7788 100644
--- a/services/input/EventHub.cpp
+++ b/services/input/EventHub.cpp
@@ -1381,7 +1381,7 @@ void EventHub::releaseControllerNumberLocked(Device* device) {
bool EventHub::hasKeycodeLocked(Device* device, int keycode) const {
- if (!device->keyMap.haveKeyLayout() || !device->keyBitmask) {
+ if (!device->keyMap.haveKeyLayout()) {
return false;
}