mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
fix:android activity jni global reference leak (#13631)
* fix:android activity jni global reference leak * improve:only release jniObjectActivity,keep classloader add nullptr check for classloader to avoid new global reference many times
This commit is contained in:
@@ -567,6 +567,7 @@ int AndroidPlatform::init() {
|
||||
void AndroidPlatform::onDestroy() {
|
||||
UniversalPlatform::onDestroy();
|
||||
unregisterAllInterfaces();
|
||||
JniHelper::onDestroy();
|
||||
CC_SAFE_DELETE(_inputProxy)
|
||||
}
|
||||
|
||||
|
||||
@@ -138,6 +138,16 @@ void JniHelper::init(JNIEnv *env, jobject activity) {
|
||||
CC_ASSERT(ok);
|
||||
}
|
||||
|
||||
void JniHelper::onDestroy() {
|
||||
if(JniHelper::sJavaVM) {
|
||||
if(JniHelper::sActivity) {
|
||||
cc::JniHelper::getEnv()->DeleteGlobalRef(JniHelper::sActivity);
|
||||
JniHelper::sActivity = nullptr;
|
||||
}
|
||||
LOGD("JniHelper::onDestroy");
|
||||
}
|
||||
}
|
||||
|
||||
JNIEnv *JniHelper::cacheEnv() {
|
||||
JavaVM *jvm = JniHelper::sJavaVM;
|
||||
JNIEnv *env = nullptr;
|
||||
@@ -189,31 +199,34 @@ jobject JniHelper::getActivity() {
|
||||
|
||||
#if CC_PLATFORM == CC_PLATFORM_OHOS
|
||||
bool JniHelper::setClassLoaderFrom(jobject activityinstance) {
|
||||
JniMethodInfo getclassloaderMethod;
|
||||
if (!JniHelper::getMethodInfoDefaultClassLoader(getclassloaderMethod,
|
||||
"ohos/app/AbilityContext",
|
||||
"getClassloader", // typo ?
|
||||
"()Ljava/lang/ClassLoader;")) {
|
||||
return false;
|
||||
if(!JniHelper::classloader) {
|
||||
JniMethodInfo getclassloaderMethod;
|
||||
if (!JniHelper::getMethodInfoDefaultClassLoader(getclassloaderMethod,
|
||||
"ohos/app/AbilityContext",
|
||||
"getClassloader", // typo ?
|
||||
"()Ljava/lang/ClassLoader;")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
jobject klassLoader = cc::JniHelper::getEnv()->CallObjectMethod(activityinstance,
|
||||
getclassloaderMethod.methodID);
|
||||
|
||||
if (nullptr == klassLoader) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JniMethodInfo loadClass;
|
||||
if (!JniHelper::getMethodInfoDefaultClassLoader(loadClass,
|
||||
"java/lang/ClassLoader",
|
||||
"loadClass",
|
||||
"(Ljava/lang/String;)Ljava/lang/Class;")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JniHelper::classloader = cc::JniHelper::getEnv()->NewGlobalRef(klassLoader);
|
||||
JniHelper::loadclassMethodMethodId = loadClass.methodID;
|
||||
}
|
||||
|
||||
jobject klassLoader = cc::JniHelper::getEnv()->CallObjectMethod(activityinstance,
|
||||
getclassloaderMethod.methodID);
|
||||
|
||||
if (nullptr == klassLoader) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JniMethodInfo loadClass;
|
||||
if (!JniHelper::getMethodInfoDefaultClassLoader(loadClass,
|
||||
"java/lang/ClassLoader",
|
||||
"loadClass",
|
||||
"(Ljava/lang/String;)Ljava/lang/Class;")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JniHelper::classloader = cc::JniHelper::getEnv()->NewGlobalRef(klassLoader);
|
||||
JniHelper::loadclassMethodMethodId = loadClass.methodID;
|
||||
JniHelper::sActivity = cc::JniHelper::getEnv()->NewGlobalRef(activityinstance);
|
||||
if (JniHelper::classloaderCallback != nullptr) {
|
||||
JniHelper::classloaderCallback();
|
||||
@@ -223,31 +236,34 @@ bool JniHelper::setClassLoaderFrom(jobject activityinstance) {
|
||||
}
|
||||
#elif CC_PLATFORM == CC_PLATFORM_ANDROID
|
||||
bool JniHelper::setClassLoaderFrom(jobject activityinstance) {
|
||||
JniMethodInfo getClassloaderMethod;
|
||||
if (!JniHelper::getMethodInfoDefaultClassLoader(getClassloaderMethod,
|
||||
"android/content/Context",
|
||||
"getClassLoader",
|
||||
"()Ljava/lang/ClassLoader;")) {
|
||||
return false;
|
||||
if (!JniHelper::classloader) {
|
||||
JniMethodInfo getClassloaderMethod;
|
||||
if (!JniHelper::getMethodInfoDefaultClassLoader(getClassloaderMethod,
|
||||
"android/content/Context",
|
||||
"getClassLoader",
|
||||
"()Ljava/lang/ClassLoader;")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
jobject classLoader = cc::JniHelper::getEnv()->CallObjectMethod(activityinstance,
|
||||
getClassloaderMethod.methodID);
|
||||
|
||||
if (nullptr == classLoader) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JniMethodInfo loadClass;
|
||||
if (!JniHelper::getMethodInfoDefaultClassLoader(loadClass,
|
||||
"java/lang/ClassLoader",
|
||||
"loadClass",
|
||||
"(Ljava/lang/String;)Ljava/lang/Class;")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JniHelper::classloader = cc::JniHelper::getEnv()->NewGlobalRef(classLoader);
|
||||
JniHelper::loadclassMethodMethodId = loadClass.methodID;
|
||||
}
|
||||
|
||||
jobject classLoader = cc::JniHelper::getEnv()->CallObjectMethod(activityinstance,
|
||||
getClassloaderMethod.methodID);
|
||||
|
||||
if (nullptr == classLoader) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JniMethodInfo loadClass;
|
||||
if (!JniHelper::getMethodInfoDefaultClassLoader(loadClass,
|
||||
"java/lang/ClassLoader",
|
||||
"loadClass",
|
||||
"(Ljava/lang/String;)Ljava/lang/Class;")) {
|
||||
return false;
|
||||
}
|
||||
|
||||
JniHelper::classloader = cc::JniHelper::getEnv()->NewGlobalRef(classLoader);
|
||||
JniHelper::loadclassMethodMethodId = loadClass.methodID;
|
||||
JniHelper::sActivity = cc::JniHelper::getEnv()->NewGlobalRef(activityinstance);
|
||||
if (JniHelper::classloaderCallback != nullptr) {
|
||||
JniHelper::classloaderCallback();
|
||||
|
||||
@@ -76,6 +76,7 @@ public:
|
||||
static JNIEnv *getEnv();
|
||||
static jobject getActivity();
|
||||
static void init(JNIEnv *env, jobject activity);
|
||||
static void onDestroy();
|
||||
|
||||
//NOLINTNEXTLINE
|
||||
static bool getStaticMethodInfo(JniMethodInfo &methodInfo,
|
||||
|
||||
Reference in New Issue
Block a user