commit ebcc45df7737f571b0f55c9deebd299cbadd2e25
author Chih-hung Hsieh <chh@google.com> Tue Nov 18 00:27:52 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 18 00:27:52 2014 +0000
tree 7e839e6f59421d1e62d6ad25bc6e06568be3b9ff
parent 765f12c7de9bb408b371c5ab7fc9dd39c10f8455
parent accddd9ca0bef572674b895b9b2b0553b133c793

am accddd9c: am 947a6adf: Merge "Remove comparisons that can\'t be true"

* commit 'accddd9ca0bef572674b895b9b2b0553b133c793':
  Remove comparisons that can't be true

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;
     }