Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a3c7c9b authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Android (Google) Code Review
Browse files

Merge changes from topics "alt+meta=caps", "hasKeycode_bugfix" into main 

* changes:
  Allow toggle caps lock even if device doesn't a have caps lock key
  hasKeycode API should take into account key remapping
parents 9a43d3f7 5c4f7988

include/input/KeyCharacterMap.h

+3 −0
Original line number Diff line number Diff line
@@ -137,6 +137,9 @@ public: 
    /* Returns keycode after applying Android key code remapping defined in mKeyRemapping */

    int32_t applyKeyRemapping(int32_t fromKeyCode) const;



    /** Returns list of keycodes that remap to provided keycode (@see setKeyRemapping()) */

    std::vector<int32_t> findKeyCodesMappedToKeyCode(int32_t toKeyCode) const;



    /* Returns the <keyCode, metaState> pair after applying key behavior defined in the kcm file,

     * that tries to find a replacement key code based on current meta state */

    std::pair<int32_t /*keyCode*/, int32_t /*metaState*/> applyKeyBehavior(int32_t keyCode,

libs/input/KeyCharacterMap.cpp

+11 −0
Original line number Diff line number Diff line
@@ -365,6 +365,17 @@ int32_t KeyCharacterMap::applyKeyRemapping(int32_t fromKeyCode) const { 
    return toKeyCode;

}



std::vector<int32_t> KeyCharacterMap::findKeyCodesMappedToKeyCode(int32_t toKeyCode) const {

    std::vector<int32_t> fromKeyCodes;



    for (const auto& [from, to] : mKeyRemapping) {

        if (toKeyCode == to) {

            fromKeyCodes.push_back(from);

        }

    }

    return fromKeyCodes;

}



std::pair<int32_t, int32_t> KeyCharacterMap::applyKeyBehavior(int32_t fromKeyCode,

                                                              int32_t fromMetaState) const {

    int32_t toKeyCode = fromKeyCode;

services/inputflinger/reader/EventHub.cpp

+13 −1
Original line number Diff line number Diff line
@@ -659,6 +659,19 @@ void EventHub::Device::populateAbsoluteAxisStates() { 
}



bool EventHub::Device::hasKeycodeLocked(int keycode) const {

    if (hasKeycodeInternalLocked(keycode)) {

        return true;

    }



    for (auto& fromKey : getKeyCharacterMap()->findKeyCodesMappedToKeyCode(keycode)) {

        if (hasKeycodeInternalLocked(fromKey)) {

            return true;

        }

    }

    return false;

}



bool EventHub::Device::hasKeycodeInternalLocked(int keycode) const {

    if (!keyMap.haveKeyLayout()) {

        return false;

    }
@@ -676,7 +689,6 @@ bool EventHub::Device::hasKeycodeLocked(int keycode) const { 
    if (usageCodes.size() > 0 && mscBitmask.test(MSC_SCAN)) {

        return true;

    }



    return false;

}

services/inputflinger/reader/InputDevice.cpp

+0 −10
Original line number Diff line number Diff line
@@ -691,16 +691,6 @@ int32_t InputDevice::getMetaState() { 
    return result;

}



void InputDevice::updateMetaState(int32_t keyCode) {

    first_in_mappers<bool>([keyCode](InputMapper& mapper) {

        if (sourcesMatchMask(mapper.getSources(), AINPUT_SOURCE_KEYBOARD) &&

            mapper.updateMetaState(keyCode)) {

            return std::make_optional(true);

        }

        return std::optional<bool>();

    });

}



void InputDevice::bumpGeneration() {

    mGeneration = mContext->bumpGeneration();

}

services/inputflinger/reader/InputReader.cpp

+2 −11
Original line number Diff line number Diff line
@@ -584,18 +584,9 @@ int32_t InputReader::getStateLocked(int32_t deviceId, uint32_t sourceMask, int32 


void InputReader::toggleCapsLockState(int32_t deviceId) {

    std::scoped_lock _l(mLock);

    InputDevice* device = findInputDeviceLocked(deviceId);

    if (!device) {

        ALOGW("Ignoring toggleCapsLock for unknown deviceId %" PRId32 ".", deviceId);

        return;

    }



    if (device->isIgnored()) {

        ALOGW("Ignoring toggleCapsLock for ignored deviceId %" PRId32 ".", deviceId);

        return;

    if (mKeyboardClassifier->getKeyboardType(deviceId) == KeyboardType::ALPHABETIC) {

        updateLedMetaStateLocked(mLedMetaState ^ AMETA_CAPS_LOCK_ON);

    }



    device->updateMetaState(AKEYCODE_CAPS_LOCK);

}



bool InputReader::hasKeys(int32_t deviceId, uint32_t sourceMask,