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

Commit dcc37dba authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Explicit cast from android::Base::Errno to status_t" am: 61ca5d7c am:... 

Merge "Explicit cast from android::Base::Errno to status_t" am: 61ca5d7c am: b09f0dd1 am: e744aef4 am: 1c15308b

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

Change-Id: I12a4eaede3424d179f6977a8a68b0ca55271ff31
parents 93cbc8aa 1c15308b

services/core/jni/com_android_server_input_InputManagerService.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1595,7 +1595,7 @@ static jobject nativeCreateInputChannel(JNIEnv* env, jclass /* clazz */, jlong p 


    if (!inputChannel.ok()) {

        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());

        return nullptr;

    }
@@ -1629,7 +1629,7 @@ static jobject nativeCreateInputMonitor(JNIEnv* env, jclass /* clazz */, jlong p 


    if (!inputChannel.ok()) {

        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());

        return nullptr;

    }