From f291a4ed3a64dd95bf8136f352e5d0554ada4a7c Mon Sep 17 00:00:00 2001 From: Fredia Huya-Kouadio Date: Mon, 15 Apr 2024 10:30:18 -0700 Subject: Fix leakage of JNI object references Fixes https://github.com/godotengine/godot/issues/87548 --- platform/android/file_access_android.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'platform/android/file_access_android.cpp') diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp index f56eda4694..ae336d6f9d 100644 --- a/platform/android/file_access_android.cpp +++ b/platform/android/file_access_android.cpp @@ -31,8 +31,12 @@ #include "file_access_android.h" #include "core/string/print_string.h" +#include "thread_jandroid.h" + +#include AAssetManager *FileAccessAndroid::asset_manager = nullptr; +jobject FileAccessAndroid::j_asset_manager = nullptr; String FileAccessAndroid::get_path() const { return path_src; @@ -257,3 +261,16 @@ void FileAccessAndroid::close() { FileAccessAndroid::~FileAccessAndroid() { _close(); } + +void FileAccessAndroid::setup(jobject p_asset_manager) { + JNIEnv *env = get_jni_env(); + j_asset_manager = env->NewGlobalRef(p_asset_manager); + asset_manager = AAssetManager_fromJava(env, j_asset_manager); +} + +void FileAccessAndroid::terminate() { + JNIEnv *env = get_jni_env(); + ERR_FAIL_NULL(env); + + env->DeleteGlobalRef(j_asset_manager); +} -- cgit v1.2.3