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

JNI: Attach Android thread to JRE, is it safe?

Browse Source
This commit is contained in:
khanhduytran0 2020-09-09 06:09:50 +07:00
parent 1690938b3b
commit 8a6d23a06f
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/jni/egl_bridge.c
View File

@ -154,7 +154,7 @@ JNIEXPORT jboolean JNICALL Java_org_lwjgl_glfw_GLFW_nativeEglMakeCurrent(JNIEnv*
printf("First frame error: %p\n", eglGetError()); printf("First frame error: %p\n", eglGetError());
#endif #endif
isEglMakeCurrentCalled = 1; isInputReady = true;
return success == EGL_TRUE ? JNI_TRUE : JNI_FALSE; return success == EGL_TRUE ? JNI_TRUE : JNI_FALSE;
} }

7
app/src/main/jni/input_bridge.c
View File

@ -3,7 +3,12 @@
#include "utils.h" #include "utils.h"
JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_LWJGLInputSender_sendDataToJRE(JNIEnv* env, jclass clazz, jint type, jstring data) { JNIEXPORT void JNICALL Java_net_kdt_pojavlaunch_LWJGLInputSender_sendDataToJRE(JNIEnv* env, jclass clazz, jint type, jstring data) {
if (isEglMakeCurrentCalled == 1) { if (isInputReady) {
if (!isAndroidThreadAttached) {
(*runtimeJavaVMPtr)->AttachCurrentThread(runtimeJavaVMPtr, &runtimeJNIEnvPtr, NULL);
isAndroidThreadAttached = true;
}
// Convert Dalvik string to JRE string: should or use directly? // Convert Dalvik string to JRE string: should or use directly?
char *data_c = (char*)(*env)->GetStringUTFChars(env, data, 0); char *data_c = (char*)(*env)->GetStringUTFChars(env, data, 0);
jstring data_jre = (*runtimeJNIEnvPtr)->NewStringUTF(runtimeJNIEnvPtr, data_c); jstring data_jre = (*runtimeJNIEnvPtr)->NewStringUTF(runtimeJNIEnvPtr, data_c);

2
app/src/main/jni/jre_launcher.c
View File

@ -68,7 +68,7 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved)
*/ */
} else if (dalvikJavaVMPtr != vm) { } else if (dalvikJavaVMPtr != vm) {
runtimeJavaVMPtr = vm; runtimeJavaVMPtr = vm;
(*vm)->GetEnv(vm, (void**) &runtimeJNIEnvPtr, JNI_VERSION_1_4); // (*vm)->GetEnv(vm, (void**) &runtimeJNIEnvPtr, JNI_VERSION_1_4);
} }
LOGD("JNI_OnLoad returning()"); LOGD("JNI_OnLoad returning()");
return JNI_VERSION_1_4; return JNI_VERSION_1_4;

5
app/src/main/jni/utils.h
View File

@ -1,13 +1,16 @@
#ifndef _BINARY_UTILS_H_ #ifndef _BINARY_UTILS_H_
#define _BINARY_UTILS_H_ #define _BINARY_UTILS_H_
#include <stdbool.h>
JavaVM *runtimeJavaVMPtr; JavaVM *runtimeJavaVMPtr;
JNIEnv *runtimeJNIEnvPtr; JNIEnv *runtimeJNIEnvPtr;
JavaVM *dalvikJavaVMPtr; JavaVM *dalvikJavaVMPtr;
JNIEnv *dalvikJNIEnvPtr; JNIEnv *dalvikJNIEnvPtr;
int isEglMakeCurrentCalled; bool isInputReady;
bool isAndroidThreadAttached;
char** convert_to_char_array(JNIEnv *env, jobjectArray jstringArray); char** convert_to_char_array(JNIEnv *env, jobjectArray jstringArray);
jobjectArray convert_from_char_array(JNIEnv *env, char **charArray, int num_rows); jobjectArray convert_from_char_array(JNIEnv *env, char **charArray, int num_rows);