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

Commit 1c15308b 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

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

Change-Id: I7b0e0641494634597ca1eaa622a00b71a129b6df
parents dcd76d8e e744aef4

services/core/jni/com_android_server_input_InputManagerService.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -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;

    }

    }