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

Commit 2b30e45d authored by Siarhei Vishniakou's avatar Siarhei Vishniakou Committed by Automerger Merge Worker
Browse files

Merge "Use <chrono> for injectInputEvent timeout" into rvc-dev am: 9467e10d am: 86398524 

Change-Id: I82ca66d8d0c9218b1ad103a6054a0a2a102df53b
parents 2bae6f00 86398524

services/core/jni/com_android_server_input_InputManagerService.cpp

+14 −6
Original line number Original line Diff line number Diff line
@@ -1453,9 +1453,13 @@ static jint nativeInjectInputEvent(JNIEnv* env, jclass /* clazz */, 
            return INPUT_EVENT_INJECTION_FAILED;

            return INPUT_EVENT_INJECTION_FAILED;

        }

        }





        return (jint) im->getInputManager()->getDispatcher()->injectInputEvent(

        const int32_t result =

                & keyEvent, injectorPid, injectorUid, syncMode, timeoutMillis,

                im->getInputManager()->getDispatcher()->injectInputEvent(&keyEvent, injectorPid,

                                                                         injectorUid, syncMode,

                                                                         std::chrono::milliseconds(

                                                                                 timeoutMillis),

                                                                         uint32_t(policyFlags));

                                                                         uint32_t(policyFlags));

        return static_cast<jint>(result);

    } else if (env->IsInstanceOf(inputEventObj, gMotionEventClassInfo.clazz)) {

    } else if (env->IsInstanceOf(inputEventObj, gMotionEventClassInfo.clazz)) {

        const MotionEvent* motionEvent = android_view_MotionEvent_getNativePtr(env, inputEventObj);

        const MotionEvent* motionEvent = android_view_MotionEvent_getNativePtr(env, inputEventObj);

        if (!motionEvent) {

        if (!motionEvent) {
@@ -1463,9 +1467,13 @@ static jint nativeInjectInputEvent(JNIEnv* env, jclass /* clazz */, 
            return INPUT_EVENT_INJECTION_FAILED;

            return INPUT_EVENT_INJECTION_FAILED;

        }

        }





        return (jint) im->getInputManager()->getDispatcher()->injectInputEvent(

        const int32_t result =

                motionEvent, injectorPid, injectorUid, syncMode, timeoutMillis,

                (jint)im->getInputManager()

                        ->getDispatcher()

                        ->injectInputEvent(motionEvent, injectorPid, injectorUid, syncMode,

                                           std::chrono::milliseconds(timeoutMillis),

                                           uint32_t(policyFlags));

                                           uint32_t(policyFlags));

        return static_cast<jint>(result);

    } else {

    } else {

        jniThrowRuntimeException(env, "Invalid input event type.");

        jniThrowRuntimeException(env, "Invalid input event type.");

        return INPUT_EVENT_INJECTION_FAILED;

        return INPUT_EVENT_INJECTION_FAILED;