From cd958bcca9a249c904e8676fbc75f2e5c0d51d4a Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Wed, 23 Jan 2019 15:40:26 +0800 Subject: Correct jni declarations of input handle InputWindowHandle and InputApplicationHandle are moved from com.android.server.input to android.view since commit 788f574. The related jni declarations should also change to match the java package for the invocation from java side. Bug: 111440400 Test: atest WindowStateTests Observe no UnsatisfiedLinkError in log Change-Id: Iea4a1bfee25484d3633a8c4860106378908fd2fa --- core/jni/AndroidRuntime.cpp | 4 ++++ core/jni/android_hardware_input_InputApplicationHandle.cpp | 12 ++++++------ core/jni/android_hardware_input_InputApplicationHandle.h | 8 ++++---- core/jni/android_hardware_input_InputWindowHandle.cpp | 14 +++++++------- core/jni/android_hardware_input_InputWindowHandle.h | 8 ++++---- core/jni/android_view_SurfaceControl.cpp | 2 +- .../jni/com_android_server_input_InputManagerService.cpp | 4 ++-- services/core/jni/onload.cpp | 4 ---- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp index a586dc1e6d7e..9c4e34f53843 100644 --- a/core/jni/AndroidRuntime.cpp +++ b/core/jni/AndroidRuntime.cpp @@ -150,6 +150,8 @@ extern int register_android_graphics_text_MeasuredText(JNIEnv* env); extern int register_android_graphics_text_LineBreaker(JNIEnv *env); extern int register_android_view_DisplayEventReceiver(JNIEnv* env); extern int register_android_view_DisplayListCanvas(JNIEnv* env); +extern int register_android_view_InputApplicationHandle(JNIEnv* env); +extern int register_android_view_InputWindowHandle(JNIEnv* env); extern int register_android_view_TextureLayer(JNIEnv* env); extern int register_android_view_RenderNode(JNIEnv* env); extern int register_android_view_RenderNodeAnimator(JNIEnv* env); @@ -1365,6 +1367,8 @@ static const RegJNIRec gRegJNI[] = { REG_JNI(register_android_view_RenderNode), REG_JNI(register_android_view_RenderNodeAnimator), REG_JNI(register_android_view_DisplayListCanvas), + REG_JNI(register_android_view_InputApplicationHandle), + REG_JNI(register_android_view_InputWindowHandle), REG_JNI(register_android_view_TextureLayer), REG_JNI(register_android_view_ThreadedRenderer), REG_JNI(register_android_view_Surface), diff --git a/core/jni/android_hardware_input_InputApplicationHandle.cpp b/core/jni/android_hardware_input_InputApplicationHandle.cpp index 10005ddcb5ef..1ab58432c686 100644 --- a/core/jni/android_hardware_input_InputApplicationHandle.cpp +++ b/core/jni/android_hardware_input_InputApplicationHandle.cpp @@ -93,7 +93,7 @@ bool NativeInputApplicationHandle::updateInfo() { // --- Global functions --- -sp android_server_InputApplicationHandle_getHandle( +sp android_view_InputApplicationHandle_getHandle( JNIEnv* env, jobject inputApplicationHandleObj) { if (!inputApplicationHandleObj) { return NULL; @@ -108,7 +108,7 @@ sp android_server_InputApplicationHandle_getHandle( } else { jweak objWeak = env->NewWeakGlobalRef(inputApplicationHandleObj); handle = new NativeInputApplicationHandle(objWeak); - handle->incStrong((void*)android_server_InputApplicationHandle_getHandle); + handle->incStrong((void*)android_view_InputApplicationHandle_getHandle); env->SetLongField(inputApplicationHandleObj, gInputApplicationHandleClassInfo.ptr, reinterpret_cast(handle)); } @@ -118,7 +118,7 @@ sp android_server_InputApplicationHandle_getHandle( // --- JNI --- -static void android_server_InputApplicationHandle_nativeDispose(JNIEnv* env, jobject obj) { +static void android_view_InputApplicationHandle_nativeDispose(JNIEnv* env, jobject obj) { AutoMutex _l(gHandleMutex); jlong ptr = env->GetLongField(obj, gInputApplicationHandleClassInfo.ptr); @@ -126,7 +126,7 @@ static void android_server_InputApplicationHandle_nativeDispose(JNIEnv* env, job env->SetLongField(obj, gInputApplicationHandleClassInfo.ptr, 0); NativeInputApplicationHandle* handle = reinterpret_cast(ptr); - handle->decStrong((void*)android_server_InputApplicationHandle_getHandle); + handle->decStrong((void*)android_view_InputApplicationHandle_getHandle); } } @@ -134,7 +134,7 @@ static void android_server_InputApplicationHandle_nativeDispose(JNIEnv* env, job static const JNINativeMethod gInputApplicationHandleMethods[] = { /* name, signature, funcPtr */ { "nativeDispose", "()V", - (void*) android_server_InputApplicationHandle_nativeDispose }, + (void*) android_view_InputApplicationHandle_nativeDispose }, }; #define FIND_CLASS(var, className) \ @@ -145,7 +145,7 @@ static const JNINativeMethod gInputApplicationHandleMethods[] = { var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \ LOG_FATAL_IF(! (var), "Unable to find field " fieldName); -int register_android_server_InputApplicationHandle(JNIEnv* env) { +int register_android_view_InputApplicationHandle(JNIEnv* env) { int res = jniRegisterNativeMethods(env, "android/view/InputApplicationHandle", gInputApplicationHandleMethods, NELEM(gInputApplicationHandleMethods)); (void) res; // Faked use when LOG_NDEBUG. diff --git a/core/jni/android_hardware_input_InputApplicationHandle.h b/core/jni/android_hardware_input_InputApplicationHandle.h index 711561150e51..5abeab454141 100644 --- a/core/jni/android_hardware_input_InputApplicationHandle.h +++ b/core/jni/android_hardware_input_InputApplicationHandle.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _ANDROID_SERVER_INPUT_APPLICATION_HANDLE_H -#define _ANDROID_SERVER_INPUT_APPLICATION_HANDLE_H +#ifndef _ANDROID_VIEW_INPUT_APPLICATION_HANDLE_H +#define _ANDROID_VIEW_INPUT_APPLICATION_HANDLE_H #include @@ -40,9 +40,9 @@ private: }; -extern sp android_server_InputApplicationHandle_getHandle( +extern sp android_view_InputApplicationHandle_getHandle( JNIEnv* env, jobject inputApplicationHandleObj); } // namespace android -#endif // _ANDROID_SERVER_INPUT_APPLICATION_HANDLE_H +#endif // _ANDROID_VIEW_INPUT_APPLICATION_HANDLE_H diff --git a/core/jni/android_hardware_input_InputWindowHandle.cpp b/core/jni/android_hardware_input_InputWindowHandle.cpp index 76920f57ed08..c0e45b12cf76 100644 --- a/core/jni/android_hardware_input_InputWindowHandle.cpp +++ b/core/jni/android_hardware_input_InputWindowHandle.cpp @@ -159,7 +159,7 @@ bool NativeInputWindowHandle::updateInfo() { gInputWindowHandleClassInfo.inputApplicationHandle); if (inputApplicationHandleObj) { sp inputApplicationHandle = - android_server_InputApplicationHandle_getHandle(env, inputApplicationHandleObj); + android_view_InputApplicationHandle_getHandle(env, inputApplicationHandleObj); if (inputApplicationHandle != nullptr) { inputApplicationHandle->updateInfo(); mInfo.applicationInfo = *(inputApplicationHandle->getInfo()); @@ -174,7 +174,7 @@ bool NativeInputWindowHandle::updateInfo() { // --- Global functions --- -sp android_server_InputWindowHandle_getHandle( +sp android_view_InputWindowHandle_getHandle( JNIEnv* env, jobject inputWindowHandleObj) { if (!inputWindowHandleObj) { return NULL; @@ -189,7 +189,7 @@ sp android_server_InputWindowHandle_getHandle( } else { jweak objWeak = env->NewWeakGlobalRef(inputWindowHandleObj); handle = new NativeInputWindowHandle(objWeak); - handle->incStrong((void*)android_server_InputWindowHandle_getHandle); + handle->incStrong((void*)android_view_InputWindowHandle_getHandle); env->SetLongField(inputWindowHandleObj, gInputWindowHandleClassInfo.ptr, reinterpret_cast(handle)); } @@ -199,7 +199,7 @@ sp android_server_InputWindowHandle_getHandle( // --- JNI --- -static void android_server_InputWindowHandle_nativeDispose(JNIEnv* env, jobject obj) { +static void android_view_InputWindowHandle_nativeDispose(JNIEnv* env, jobject obj) { AutoMutex _l(gHandleMutex); jlong ptr = env->GetLongField(obj, gInputWindowHandleClassInfo.ptr); @@ -207,7 +207,7 @@ static void android_server_InputWindowHandle_nativeDispose(JNIEnv* env, jobject env->SetLongField(obj, gInputWindowHandleClassInfo.ptr, 0); NativeInputWindowHandle* handle = reinterpret_cast(ptr); - handle->decStrong((void*)android_server_InputWindowHandle_getHandle); + handle->decStrong((void*)android_view_InputWindowHandle_getHandle); } } @@ -215,7 +215,7 @@ static void android_server_InputWindowHandle_nativeDispose(JNIEnv* env, jobject static const JNINativeMethod gInputWindowHandleMethods[] = { /* name, signature, funcPtr */ { "nativeDispose", "()V", - (void*) android_server_InputWindowHandle_nativeDispose }, + (void*) android_view_InputWindowHandle_nativeDispose }, }; #define FIND_CLASS(var, className) \ @@ -226,7 +226,7 @@ static const JNINativeMethod gInputWindowHandleMethods[] = { var = env->GetFieldID(clazz, fieldName, fieldDescriptor); \ LOG_FATAL_IF(! (var), "Unable to find field " fieldName); -int register_android_server_InputWindowHandle(JNIEnv* env) { +int register_android_view_InputWindowHandle(JNIEnv* env) { int res = jniRegisterNativeMethods(env, "android/view/InputWindowHandle", gInputWindowHandleMethods, NELEM(gInputWindowHandleMethods)); (void) res; // Faked use when LOG_NDEBUG. diff --git a/core/jni/android_hardware_input_InputWindowHandle.h b/core/jni/android_hardware_input_InputWindowHandle.h index 54b89f5b7918..de5bd6ef97f4 100644 --- a/core/jni/android_hardware_input_InputWindowHandle.h +++ b/core/jni/android_hardware_input_InputWindowHandle.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef _ANDROID_SERVER_INPUT_WINDOW_HANDLE_H -#define _ANDROID_SERVER_INPUT_WINDOW_HANDLE_H +#ifndef _ANDROID_VIEW_INPUT_WINDOW_HANDLE_H +#define _ANDROID_VIEW_INPUT_WINDOW_HANDLE_H #include @@ -38,9 +38,9 @@ private: }; -extern sp android_server_InputWindowHandle_getHandle( +extern sp android_view_InputWindowHandle_getHandle( JNIEnv* env, jobject inputWindowHandleObj); } // namespace android -#endif // _ANDROID_SERVER_INPUT_WINDOW_HANDLE_H +#endif // _ANDROID_VIEW_INPUT_WINDOW_HANDLE_H diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index 897427fd8787..c72dbd98c194 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -340,7 +340,7 @@ static void nativeSetInputWindowInfo(JNIEnv* env, jclass clazz, jlong transactio jlong nativeObject, jobject inputWindow) { auto transaction = reinterpret_cast(transactionObj); - sp handle = android_server_InputWindowHandle_getHandle( + sp handle = android_view_InputWindowHandle_getHandle( env, inputWindow); handle->updateInfo(); diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index 90c9cc2b0a35..ff0b0d6f6eaf 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -782,7 +782,7 @@ void NativeInputManager::setInputWindows(JNIEnv* env, jobjectArray windowHandleO } sp windowHandle = - android_server_InputWindowHandle_getHandle(env, windowHandleObj); + android_view_InputWindowHandle_getHandle(env, windowHandleObj); if (windowHandle != nullptr) { windowHandles.push(windowHandle); } @@ -822,7 +822,7 @@ void NativeInputManager::setInputWindows(JNIEnv* env, jobjectArray windowHandleO void NativeInputManager::setFocusedApplication(JNIEnv* env, int32_t displayId, jobject applicationHandleObj) { sp applicationHandle = - android_server_InputApplicationHandle_getHandle(env, applicationHandleObj); + android_view_InputApplicationHandle_getHandle(env, applicationHandleObj); mInputManager->getDispatcher()->setFocusedApplication(displayId, applicationHandle); } diff --git a/services/core/jni/onload.cpp b/services/core/jni/onload.cpp index 918f57e2945e..6e31aedd3f76 100644 --- a/services/core/jni/onload.cpp +++ b/services/core/jni/onload.cpp @@ -26,8 +26,6 @@ namespace android { int register_android_server_AlarmManagerService(JNIEnv* env); int register_android_server_BatteryStatsService(JNIEnv* env); int register_android_server_ConsumerIrService(JNIEnv *env); -int register_android_server_InputApplicationHandle(JNIEnv* env); -int register_android_server_InputWindowHandle(JNIEnv* env); int register_android_server_InputManager(JNIEnv* env); int register_android_server_LightsService(JNIEnv* env); int register_android_server_PowerManagerService(JNIEnv* env); @@ -74,8 +72,6 @@ extern "C" jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) register_android_server_broadcastradio_Tuner(vm, env); register_android_server_PowerManagerService(env); register_android_server_SerialService(env); - register_android_server_InputApplicationHandle(env); - register_android_server_InputWindowHandle(env); register_android_server_InputManager(env); register_android_server_LightsService(env); register_android_server_AlarmManagerService(env); -- cgit v1.2.3-59-g8ed1b