diff options
| author | Chih-hung Hsieh <chh@google.com> | 2014-11-18 00:23:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 00:23:08 +0000 |
| commit | accddd9ca0bef572674b895b9b2b0553b133c793 (patch) | |
| tree | 95a12edb2d8a01aaa225f47904623e7b1dd39085 /services | |
| parent | 22536916a5abd294ed4ccfa5bde9066305c81b48 (diff) | |
| parent | 947a6adf97d9ba86e3ef5704d523b4971246ff1e (diff) | |
| download | frameworks_native-accddd9ca0bef572674b895b9b2b0553b133c793.zip frameworks_native-accddd9ca0bef572674b895b9b2b0553b133c793.tar.gz frameworks_native-accddd9ca0bef572674b895b9b2b0553b133c793.tar.bz2 | |
am 947a6adf: Merge "Remove comparisons that can\'t be true"
* commit '947a6adf97d9ba86e3ef5704d523b4971246ff1e':
Remove comparisons that can't be true
Diffstat (limited to 'services')
| -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; } |