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

Commit e744aef4 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: b09f0dd1 

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

Change-Id: I276ecc657f23047988e1f2280b3281947dfe1d05
parents a16f4ac7 b09f0dd1

services/core/jni/com_android_server_input_InputManagerService.cpp

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

    }
@@ -1619,7 +1619,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;

    }