From 14ee29abbf9d8353982de0353548023fb590bdf5 Mon Sep 17 00:00:00 2001 From: Arpit Singh Date: Fri, 16 Feb 2024 12:10:39 +0000 Subject: 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 --- native/android/input.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'native/android/input.cpp') diff --git a/native/android/input.cpp b/native/android/input.cpp index 6efb0280ac02..4708e69447ec 100644 --- a/native/android/input.cpp +++ b/native/android/input.cpp @@ -87,7 +87,7 @@ int64_t AKeyEvent_getDownTime(const AInputEvent* key_event) { const AInputEvent* AKeyEvent_fromJava(JNIEnv* env, jobject keyEvent) { std::unique_ptr event = std::make_unique(); - *event = android::android_view_KeyEvent_toNative(env, keyEvent); + *event = android::android_view_KeyEvent_obtainAsCopy(env, keyEvent); return event.release(); } @@ -323,9 +323,9 @@ jobject AInputEvent_toJava(JNIEnv* env, const AInputEvent* aInputEvent) { static_cast( *aInputEvent)); case AINPUT_EVENT_TYPE_KEY: - return android::android_view_KeyEvent_fromNative(env, - static_cast( - *aInputEvent)); + return android::android_view_KeyEvent_obtainAsCopy(env, + static_cast( + *aInputEvent)); default: LOG_ALWAYS_FATAL("Unexpected event type %d in AInputEvent_toJava.", eventType); } -- cgit v1.2.3-59-g8ed1b