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

Commit 14ee29ab authored by Arpit Singh's avatar Arpit Singh
Browse files

Rename android.view.InputEvent obtain copy from native methods 

Rename obtain Java InputEvent copy from native methods for Key and
Motion events for consistency. This CL renames
1. android_view_MotionEvent_obtainAsCopy ->
   android_view_MotionEvent_obtainAsCopy
2. android_view_KeyEvent_fromNative ->
   android_view_KeyEvent_obtainAsCopy
3. android_view_KeyEvent_toNative ->
   android_view_KeyEvent_obtainAsCopy

Bug: 324375527
Test: atest MotionEventTest KeyEventTest
Change-Id: I2a2fee29fd8ffcce04a939d19d3f7a0ce0c5dcf1
parent 51503c1a

core/jni/android_view_InputEventReceiver.cpp

+2 −2
Original line number Diff line number Diff line
@@ -378,7 +378,7 @@ status_t NativeInputEventReceiver::consumeEvents(JNIEnv* env, 
                        ALOGD("channel '%s' ~ Received key event.", getInputChannelName().c_str());

                    }

                    inputEventObj =

                            android_view_KeyEvent_fromNative(env,

                            android_view_KeyEvent_obtainAsCopy(env,

                                                               static_cast<KeyEvent&>(*inputEvent));

                    break;

core/jni/android_view_InputEventSender.cpp

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

    sp<NativeInputEventSender> sender =

            reinterpret_cast<NativeInputEventSender*>(senderPtr);

    const KeyEvent event = android_view_KeyEvent_toNative(env, eventObj);

    const KeyEvent event = android_view_KeyEvent_obtainAsCopy(env, eventObj);

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

    return !status;

}

core/jni/android_view_InputQueue.cpp

+1 −1
Original line number Diff line number Diff line
@@ -221,7 +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();

    *event = android_view_KeyEvent_toNative(env, eventObj);

    *event = android_view_KeyEvent_obtainAsCopy(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
@@ -219,7 +219,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_obtainAsCopy(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

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static struct { 


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



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

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

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

    jobject eventObj =

            env->CallStaticObjectMethod(gKeyEventClassInfo.clazz, gKeyEventClassInfo.obtain,
@@ -113,7 +113,7 @@ jobject android_view_KeyEvent_fromNative(JNIEnv* env, const KeyEvent& event) { 
    return eventObj;

}



KeyEvent android_view_KeyEvent_toNative(JNIEnv* env, jobject eventObj) {

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