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

Commit 048d057e authored by Prabir Pradhan's avatar Prabir Pradhan Committed by Automerger Merge Worker
Browse files

Merge changes from topic "dispatcher-policy-cleanup" into udc-dev am: c5d91239 

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



Change-Id: Iad9e3877ec6c679041432aacd332d647336152d6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f29e494d c5d91239

core/jni/android_view_InputEventReceiver.cpp

+1 −1
Original line number Diff line number Diff line
@@ -374,7 +374,7 @@ status_t NativeInputEventReceiver::consumeEvents(JNIEnv* env, 
                    }

                    inputEventObj =

                            android_view_KeyEvent_fromNative(env,

                                                             static_cast<KeyEvent*>(inputEvent));

                                                             static_cast<KeyEvent&>(*inputEvent));

                    break;



                case InputEventType::MOTION: {

core/jni/android_view_InputEventSender.cpp

+1 −2
Original line number Diff line number Diff line
@@ -353,8 +353,7 @@ static jboolean nativeSendKeyEvent(JNIEnv* env, jclass clazz, jlong senderPtr, 
        jint seq, jobject eventObj) {

    sp<NativeInputEventSender> sender =

            reinterpret_cast<NativeInputEventSender*>(senderPtr);

    KeyEvent event;

    android_view_KeyEvent_toNative(env, eventObj, &event);

    const KeyEvent event = android_view_KeyEvent_toNative(env, eventObj);

    status_t status = sender->sendKeyEvent(seq, &event);

    return !status;

}

core/jni/android_view_InputQueue.cpp

+1 −6
Original line number Diff line number Diff line
@@ -221,12 +221,7 @@ static jlong nativeSendKeyEvent(JNIEnv* env, jobject clazz, jlong ptr, jobject e 
        jboolean predispatch) {

    InputQueue* queue = reinterpret_cast<InputQueue*>(ptr);

    KeyEvent* event = queue->createKeyEvent();

    status_t status = android_view_KeyEvent_toNative(env, eventObj, event);

    if (status) {

        queue->recycleInputEvent(event);

        jniThrowRuntimeException(env, "Could not read contents of KeyEvent object.");

        return -1;

    }

    *event = android_view_KeyEvent_toNative(env, eventObj);



    if (predispatch) {

        event->setFlags(event->getFlags() | AKEY_EVENT_FLAG_PREDISPATCH);

core/jni/android_view_KeyCharacterMap.cpp

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ static jobjectArray nativeGetEvents(JNIEnv *env, jobject clazz, jlong ptr, 
        result = env->NewObjectArray(jsize(events.size()), gKeyEventClassInfo.clazz, NULL);

        if (result) {

            for (size_t i = 0; i < events.size(); i++) {

                jobject keyEventObj = android_view_KeyEvent_fromNative(env, &events.itemAt(i));

                jobject keyEventObj = android_view_KeyEvent_fromNative(env, events.itemAt(i));

                if (!keyEventObj) break; // threw OOM exception

                env->SetObjectArrayElement(result, jsize(i), keyEventObj);

                env->DeleteLocalRef(keyEventObj);

core/jni/android_view_KeyEvent.cpp

+13 −13
Original line number Diff line number Diff line
@@ -94,16 +94,16 @@ static struct { 


// ----------------------------------------------------------------------------



jobject android_view_KeyEvent_fromNative(JNIEnv* env, const KeyEvent* event) {

    ScopedLocalRef<jbyteArray> hmac = toJbyteArray(env, event->getHmac());

jobject android_view_KeyEvent_fromNative(JNIEnv* env, const KeyEvent& event) {

    ScopedLocalRef<jbyteArray> hmac = toJbyteArray(env, event.getHmac());

    jobject eventObj =

            env->CallStaticObjectMethod(gKeyEventClassInfo.clazz, gKeyEventClassInfo.obtain,

                                        event->getId(), event->getDownTime(), event->getEventTime(),

                                        event->getAction(), event->getKeyCode(),

                                        event->getRepeatCount(), event->getMetaState(),

                                        event->getDeviceId(), event->getScanCode(),

                                        event->getFlags(), event->getSource(),

                                        event->getDisplayId(), hmac.get(), nullptr);

                                        event.getId(), event.getDownTime(), event.getEventTime(),

                                        event.getAction(), event.getKeyCode(),

                                        event.getRepeatCount(), event.getMetaState(),

                                        event.getDeviceId(), event.getScanCode(), event.getFlags(),

                                        event.getSource(), event.getDisplayId(), hmac.get(),

                                        nullptr);

    if (env->ExceptionCheck()) {

        ALOGE("An exception occurred while obtaining a key event.");

        LOGE_EX(env);
@@ -113,8 +113,7 @@ jobject android_view_KeyEvent_fromNative(JNIEnv* env, const KeyEvent* event) { 
    return eventObj;

}



status_t android_view_KeyEvent_toNative(JNIEnv* env, jobject eventObj,

        KeyEvent* event) {

KeyEvent android_view_KeyEvent_toNative(JNIEnv* env, jobject eventObj) {

    jint id = env->GetIntField(eventObj, gKeyEventClassInfo.mId);

    jint deviceId = env->GetIntField(eventObj, gKeyEventClassInfo.mDeviceId);

    jint source = env->GetIntField(eventObj, gKeyEventClassInfo.mSource);
@@ -133,9 +132,10 @@ status_t android_view_KeyEvent_toNative(JNIEnv* env, jobject eventObj, 
    jlong downTime = env->GetLongField(eventObj, gKeyEventClassInfo.mDownTime);

    jlong eventTime = env->GetLongField(eventObj, gKeyEventClassInfo.mEventTime);



    event->initialize(id, deviceId, source, displayId, *hmac, action, flags, keyCode, scanCode,

    KeyEvent event;

    event.initialize(id, deviceId, source, displayId, *hmac, action, flags, keyCode, scanCode,

                     metaState, repeatCount, downTime, eventTime);

    return OK;

    return event;

}



status_t android_view_KeyEvent_recycle(JNIEnv* env, jobject eventObj) {