commit 6183eb72ec16ef36a31a9d92ad4268247a906ef0
author Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Mon Nov 17 21:09:14 2014 +0100
committer Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> Mon Nov 17 21:09:14 2014 +0100
tree bbfeb7bd4d9d49de9845a721d4eff30e58189c4d
parent 55f71bc0800b9ec7a779c5d30d5a90e074c2526b

Remove comparisons that can't be true

keyBitmask and ledBitmask are arrays, "!their address" always evaluates to
false. clang complains about this.

Change-Id: I6aed45a203b0eeaad2093dbdebea03a2c2fc1a3d
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

services/inputflinger/EventHub.cpp

diff --git a/services/inputflinger/EventHub.cpp b/services/inputflinger/EventHub.cpp
index dfe5d3d..7a77c30 100644
--- a/services/inputflinger/EventHub.cpp
+++ b/services/inputflinger/EventHub.cpp
@@ -1443,7 +1443,7 @@
 }
 
 bool EventHub::hasKeycodeLocked(Device* device, int keycode) const {
-    if (!device->keyMap.haveKeyLayout() || !device->keyBitmask) {
+    if (!device->keyMap.haveKeyLayout()) {
         return false;
     }
     
@@ -1461,7 +1461,7 @@
 }
 
 status_t EventHub::mapLed(Device* device, int32_t led, int32_t* outScanCode) const {
-    if (!device->keyMap.haveKeyLayout() || !device->ledBitmask) {
+    if (!device->keyMap.haveKeyLayout()) {
         return NAME_NOT_FOUND;
     }