diff options
author | Chih-hung Hsieh <chh@google.com> | 2014-11-18 00:14:44 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-18 00:14:45 +0000 |
commit | 947a6adf97d9ba86e3ef5704d523b4971246ff1e (patch) | |
tree | 408298711b58cef190317890eb6128da3b372ae9 | |
parent | 1bb53054f2d77ce570a22629006c849fc54707dc (diff) | |
parent | 6183eb72ec16ef36a31a9d92ad4268247a906ef0 (diff) | |
download | frameworks_native-947a6adf97d9ba86e3ef5704d523b4971246ff1e.zip frameworks_native-947a6adf97d9ba86e3ef5704d523b4971246ff1e.tar.gz frameworks_native-947a6adf97d9ba86e3ef5704d523b4971246ff1e.tar.bz2 |
Merge "Remove comparisons that can't be true"
-rw-r--r-- | services/inputflinger/EventHub.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ void EventHub::setLedForController(Device* device) { } bool EventHub::hasKeycodeLocked(Device* device, int keycode) const { - if (!device->keyMap.haveKeyLayout() || !device->keyBitmask) { + if (!device->keyMap.haveKeyLayout()) { return false; } @@ -1461,7 +1461,7 @@ bool EventHub::hasKeycodeLocked(Device* device, int keycode) const { } 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; } |