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

Commit 77c3e4b9 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Make getFallbackAction return false when there is none." into honeycomb

parents 06bc9721 fca66d3b

libs/ui/KeyCharacterMap.cpp

+5 −3
Original line number Diff line number Diff line
@@ -185,10 +185,12 @@ bool KeyCharacterMap::getFallbackAction(int32_t keyCode, int32_t metaState, 
    const Key* key;

    const Behavior* behavior;

    if (getKeyBehavior(keyCode, metaState, &key, &behavior)) {

        if (behavior->fallbackKeyCode) {

            outFallbackAction->keyCode = behavior->fallbackKeyCode;

            outFallbackAction->metaState = metaState & ~behavior->metaState;

            result = true;

        }

    }

#if DEBUG_MAPPING

    LOGD("getFallbackKeyCode: keyCode=%d, metaState=0x%08x ~ Result %s, "

            "fallback keyCode=%d, fallback metaState=0x%08x.",