From 60c3eaf5ee4c089f6b805661b118aa7265af7d96 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 17 Oct 2024 09:24:36 -0700
Subject: [PATCH] Use SDL_GetAndroidJNIEnv() in hid.cpp
---
src/hidapi/android/hid.cpp | 53 +++++---------------------------------
1 file changed, 6 insertions(+), 47 deletions(-)
diff --git a/src/hidapi/android/hid.cpp b/src/hidapi/android/hid.cpp
index edea8d1d9cf00..3a5f53c0bffe6 100644
--- a/src/hidapi/android/hid.cpp
+++ b/src/hidapi/android/hid.cpp
@@ -98,9 +98,6 @@ struct hid_device_
int m_nDeviceRefCount;
};
-static JavaVM *g_JVM;
-static pthread_key_t g_ThreadKey;
-
template<class T>
class hid_device_ref
{
@@ -495,10 +492,7 @@ class CHIDDevice
bool BOpen()
{
- // Make sure thread is attached to JVM/env
- JNIEnv *env;
- g_JVM->AttachCurrentThread( &env, NULL );
- pthread_setspecific( g_ThreadKey, (void*)env );
+ JNIEnv *env = SDL_GetAndroidJNIEnv();
if ( !g_HIDDeviceManagerCallbackHandler )
{
@@ -610,10 +604,7 @@ class CHIDDevice
int WriteReport( const unsigned char *pData, size_t nDataLen, bool bFeature )
{
- // Make sure thread is attached to JVM/env
- JNIEnv *env;
- g_JVM->AttachCurrentThread( &env, NULL );
- pthread_setspecific( g_ThreadKey, (void*)env );
+ JNIEnv *env = SDL_GetAndroidJNIEnv();
int nRet = -1;
if ( g_HIDDeviceManagerCallbackHandler )
@@ -645,10 +636,7 @@ class CHIDDevice
int ReadReport( unsigned char *pData, size_t nDataLen, bool bFeature )
{
- // Make sure thread is attached to JVM/env
- JNIEnv *env;
- g_JVM->AttachCurrentThread( &env, NULL );
- pthread_setspecific( g_ThreadKey, (void*)env );
+ JNIEnv *env = SDL_GetAndroidJNIEnv();
if ( !g_HIDDeviceManagerCallbackHandler )
{
@@ -721,10 +709,7 @@ class CHIDDevice
void Close( bool bDeleteDevice )
{
- // Make sure thread is attached to JVM/env
- JNIEnv *env;
- g_JVM->AttachCurrentThread( &env, NULL );
- pthread_setspecific( g_ThreadKey, (void*)env );
+ JNIEnv *env = SDL_GetAndroidJNIEnv();
if ( g_HIDDeviceManagerCallbackHandler )
{
@@ -793,16 +778,6 @@ static hid_device_ref<CHIDDevice> FindDevice( int nDeviceId )
return pDevice;
}
-static void ThreadDestroyed(void* value)
-{
- /* The thread is being destroyed, detach it from the Java VM and set the g_ThreadKey value to NULL as required */
- JNIEnv *env = (JNIEnv*) value;
- if (env != NULL) {
- g_JVM->DetachCurrentThread();
- pthread_setspecific(g_ThreadKey, NULL);
- }
-}
-
extern "C"
JNIEXPORT void JNICALL HID_DEVICE_MANAGER_JAVA_INTERFACE(HIDDeviceRegisterCallback)(JNIEnv *env, jobject thiz);
@@ -834,16 +809,6 @@ JNIEXPORT void JNICALL HID_DEVICE_MANAGER_JAVA_INTERFACE(HIDDeviceRegisterCallba
{
LOGV( "HIDDeviceRegisterCallback()");
- env->GetJavaVM( &g_JVM );
-
- /*
- * Create mThreadKey so we can keep track of the JNIEnv assigned to each thread
- * Refer to http://developer.android.com/guide/practices/design/jni.html for the rationale behind this
- */
- if (pthread_key_create(&g_ThreadKey, ThreadDestroyed) != 0) {
- __android_log_print(ANDROID_LOG_ERROR, TAG, "Error initializing pthread key");
- }
-
if ( g_HIDDeviceManagerCallbackHandler != NULL )
{
env->DeleteGlobalRef( g_HIDDeviceManagerCallbackClass );
@@ -1035,10 +1000,7 @@ static void SDLCALL RequestBluetoothPermissionCallback( void *userdata, const ch
if ( granted && g_HIDDeviceManagerCallbackHandler )
{
- // Make sure thread is attached to JVM/env
- JNIEnv *env;
- g_JVM->AttachCurrentThread( &env, NULL );
- pthread_setspecific( g_ThreadKey, (void*)env );
+ JNIEnv *env = SDL_GetAndroidJNIEnv();
env->CallBooleanMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerInitialize, false, true );
}
@@ -1051,10 +1013,7 @@ int hid_init(void)
// HIDAPI doesn't work well with Android < 4.3
if ( SDL_GetAndroidSDKVersion() >= 18 )
{
- // Make sure thread is attached to JVM/env
- JNIEnv *env;
- g_JVM->AttachCurrentThread( &env, NULL );
- pthread_setspecific( g_ThreadKey, (void*)env );
+ JNIEnv *env = SDL_GetAndroidJNIEnv();
env->CallBooleanMethod( g_HIDDeviceManagerCallbackHandler, g_midHIDDeviceManagerInitialize, true, false );