diff options
| -rw-r--r-- | core/jni/android_view_KeyCharacterMap.cpp | 2 | ||||
| -rw-r--r-- | services/core/jni/com_android_server_input_InputManagerService.cpp | 2 | ||||
| -rw-r--r-- | tools/validatekeymaps/Main.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/core/jni/android_view_KeyCharacterMap.cpp b/core/jni/android_view_KeyCharacterMap.cpp index cbce38e12d25..12d8bc6835e1 100644 --- a/core/jni/android_view_KeyCharacterMap.cpp +++ b/core/jni/android_view_KeyCharacterMap.cpp @@ -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, diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index c1d5f19fd256..3a001965402f 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -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; } diff --git a/tools/validatekeymaps/Main.cpp b/tools/validatekeymaps/Main.cpp index 0af6266d1642..3865076e8484 100644 --- a/tools/validatekeymaps/Main.cpp +++ b/tools/validatekeymaps/Main.cpp @@ -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; |