Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Explicit cast from android::Base::Errno to status_t" am: 61ca5d7c56 am: b09f0dd179 am: e744aef437

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1926909

Change-Id: I7b0e0641494634597ca1eaa622a00b71a129b6df
This commit is contained in:
Treehugger Robot
2022-01-06 12:06:52 +00:00
committed by Automerger Merge Worker
parent dcd76d8e99 e744aef437
commit 1c15308b45
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/jni/com_android_server_input_InputManagerService.cpp
View File

@@ -1585,7 +1585,7 @@ static jobject nativeCreateInputChannel(JNIEnv* env, jclass /* clazz */, jlong p
if (!inputChannel.ok()) { if (!inputChannel.ok()) {
std::string message = inputChannel.error().message(); std::string message = inputChannel.error().message();
message += StringPrintf(" Status=%d", inputChannel.error().code()); message += StringPrintf(" Status=%d", static_cast<int>(inputChannel.error().code()));
jniThrowRuntimeException(env, message.c_str()); jniThrowRuntimeException(env, message.c_str());
return nullptr; return nullptr;
} }
@@ -1619,7 +1619,7 @@ static jobject nativeCreateInputMonitor(JNIEnv* env, jclass /* clazz */, jlong p
if (!inputChannel.ok()) { if (!inputChannel.ok()) {
std::string message = inputChannel.error().message(); std::string message = inputChannel.error().message();
message += StringPrintf(" Status=%d", inputChannel.error().code()); message += StringPrintf(" Status=%d", static_cast<int>(inputChannel.error().code()));
jniThrowRuntimeException(env, message.c_str()); jniThrowRuntimeException(env, message.c_str());
return nullptr; return nullptr;
} }