Merge "Remove comparisons that can't be true"

This commit is contained in:
Chih-hung Hsieh 2014-11-18 00:14:44 +00:00 committed by Gerrit Code Review
commit 947a6adf97

View File

@ -1443,7 +1443,7 @@ void EventHub::setLedForController(Device* device) {
} }
bool EventHub::hasKeycodeLocked(Device* device, int keycode) const { bool EventHub::hasKeycodeLocked(Device* device, int keycode) const {
if (!device->keyMap.haveKeyLayout() || !device->keyBitmask) { if (!device->keyMap.haveKeyLayout()) {
return false; 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 { 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; return NAME_NOT_FOUND;
} }