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

Commit 00190af7 authored by Michael Wright's avatar Michael Wright
Browse files

Convert KeyCharacterMap to enum class 

Test: compiles
Bug: 160010896
Change-Id: I178ef13f77279950db38174614f31044aa8096d3
parent 0ac8f0c7

core/jni/android_view_KeyCharacterMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static jchar nativeGetDisplayLabel(JNIEnv *env, jobject clazz, jlong ptr, jint k 


static jint nativeGetKeyboardType(JNIEnv *env, jobject clazz, jlong ptr) {

    NativeKeyCharacterMap* map = reinterpret_cast<NativeKeyCharacterMap*>(ptr);

    return map->getMap()->getKeyboardType();

    return static_cast<jint>(map->getMap()->getKeyboardType());

}



static jobjectArray nativeGetEvents(JNIEnv *env, jobject clazz, jlong ptr,

services/core/jni/com_android_server_input_InputManagerService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -650,7 +650,7 @@ std::shared_ptr<KeyCharacterMap> NativeInputManager::getKeyboardLayoutOverlay( 


        base::Result<std::shared_ptr<KeyCharacterMap>> ret =

                KeyCharacterMap::loadContents(filenameChars.c_str(), contentsChars.c_str(),

                                              KeyCharacterMap::FORMAT_OVERLAY);

                                              KeyCharacterMap::Format::OVERLAY);

        if (ret) {

            result = *ret;

        }

tools/validatekeymaps/Main.cpp

+2 −2
Original line number Diff line number Diff line
@@ -105,8 +105,8 @@ static bool validateFile(const char* filename) { 
    }



    case FILETYPE_KEYCHARACTERMAP: {

        base::Result<std::shared_ptr<KeyCharacterMap>> ret = KeyCharacterMap::load(filename,

                KeyCharacterMap::FORMAT_ANY);

        base::Result<std::shared_ptr<KeyCharacterMap>> ret =

                KeyCharacterMap::load(filename, KeyCharacterMap::Format::ANY);

        if (!ret) {

            error("Error %s parsing key character map file.\n\n", ret.error().message().c_str());

            return false;