TheCloud/Amethyst-Android
1
0
Fork 0
mirror of https://github.com/AngelAuraMC/Amethyst-Android.git synced 2025-09-18 09:07:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

[JNI thread attach] Bug fix: always return false

Browse Source
This commit is contained in:
khanhduytran0 2020-11-05 12:33:06 +07:00
parent c5f753d040
commit 4d31cc1277
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/jni/input_bridge_v3.c
View File

@ -77,18 +77,22 @@ ADD_CALLBACK_WWIN(WindowSize);
#undef ADD_CALLBACK_WWIN #undef ADD_CALLBACK_WWIN
void attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr) { jboolean attachThread(bool isAndroid, JNIEnv** secondJNIEnvPtr) {
#ifdef DEBUG #ifdef DEBUG
LOGD("Debug: Attaching %s thread to %s, javavm.isNull=%d\n", isAndroid ? "Android" : "JRE", isAndroid ? "JRE" : "Android", (isAndroid ? runtimeJavaVMPtr : dalvikJavaVMPtr) == NULL); LOGD("Debug: Attaching %s thread to %s, javavm.isNull=%d\n", isAndroid ? "Android" : "JRE", isAndroid ? "JRE" : "Android", (isAndroid ? runtimeJavaVMPtr : dalvikJavaVMPtr) == NULL);
#endif #endif
if (*secondJNIEnvPtr != NULL) return; if (*secondJNIEnvPtr != NULL) return JNI_TRUE;
if (isAndroid && runtimeJavaVMPtr) { if (isAndroid && runtimeJavaVMPtr) {
(*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, secondJNIEnvPtr, NULL); (*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, secondJNIEnvPtr, NULL);
return JNI_TRUE;
} else if (!isAndroid && dalvikJavaVMPtr) { } else if (!isAndroid && dalvikJavaVMPtr) {
(*dalvikJavaVMPtr)->AttachCurrentThread(dalvikJavaVMPtr, secondJNIEnvPtr, NULL); (*dalvikJavaVMPtr)->AttachCurrentThread(dalvikJavaVMPtr, secondJNIEnvPtr, NULL);
return JNI_TRUE;
} }
return JNI_FALSE;
} }
void getJavaInputBridge(jclass* clazz, jmethodID* method) { void getJavaInputBridge(jclass* clazz, jmethodID* method) {
@ -118,22 +122,27 @@ void sendData(int type, int i1, int i2, int i3, int i4) {
} }
} }
JNIEXPORT void JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) { JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeAttachThreadToOther(JNIEnv* env, jclass clazz, jboolean isAndroid, jboolean isUseStackQueue) {
#ifdef DEBUG #ifdef DEBUG
LOGD("Debug: JNI attaching thread, isUseStackQueue=%d\n", isUseStackQueue); LOGD("Debug: JNI attaching thread, isUseStackQueue=%d\n", isUseStackQueue);
#endif #endif
jboolean result;
isUseStackQueueCall = (int) isUseStackQueue; isUseStackQueueCall = (int) isUseStackQueue;
if (isAndroid) { if (isAndroid) {
attachThread(true, &runtimeJNIEnvPtr_ANDROID); result = attachThread(true, &runtimeJNIEnvPtr_ANDROID);
} else { } else {
attachThread(false, &dalvikJNIEnvPtr_JRE); result = attachThread(false, &dalvikJNIEnvPtr_JRE);
// getJavaInputBridge(&inputBridgeClass_JRE, &inputBridgeMethod_JRE); // getJavaInputBridge(&inputBridgeClass_JRE, &inputBridgeMethod_JRE);
} }
if (isUseStackQueue && isAndroid) { if (isUseStackQueue && isAndroid && result) {
isPrepareGrabPos = true; isPrepareGrabPos = true;
getJavaInputBridge(&inputBridgeClass_ANDROID, &inputBridgeMethod_ANDROID); getJavaInputBridge(&inputBridgeClass_ANDROID, &inputBridgeMethod_ANDROID);
} }
return result;
} }
JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNIEnv* env, jclass clazz, jint action, jstring copy) { JNIEXPORT jstring JNICALL Java_org_lwjgl_glfw_CallbackBridge_nativeClipboard(JNIEnv* env, jclass clazz, jint action, jstring copy) {