From 82cbdfb232ed8915f7ba77e71f6b157b61b864ad Mon Sep 17 00:00:00 2001 From: bofeng-song Date: Thu, 22 Sep 2022 10:57:12 +0800 Subject: [PATCH] fix crash while dynamic call createSurface (#12829) * fix crash while dynamic call createSurface * Fix the application crash when returning from the background to the foreground --- .../android/java/src/com/cocos/lib/CocosActivity.java | 4 ++-- native/cocos/platform/android/jni/JniCocosEntry.cpp | 2 +- native/cocos/platform/java/modules/SystemWindowManager.cpp | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java b/native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java index ff6834f806..fba7d7412b 100644 --- a/native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java +++ b/native/cocos/platform/android/java/src/com/cocos/lib/CocosActivity.java @@ -58,12 +58,12 @@ public class CocosActivity extends GameActivity { - private native void onCreateNative(Context activity); + private native void onCreateNative(); @Override protected void onCreate(Bundle savedInstanceState) { onLoadNativeLibraries(); - onCreateNative(this.getApplicationContext()); + onCreateNative(); getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); getWindow().requestFeature(Window.FEATURE_NO_TITLE); diff --git a/native/cocos/platform/android/jni/JniCocosEntry.cpp b/native/cocos/platform/android/jni/JniCocosEntry.cpp index ae2f876952..8d588c7a35 100644 --- a/native/cocos/platform/android/jni/JniCocosEntry.cpp +++ b/native/cocos/platform/android/jni/JniCocosEntry.cpp @@ -40,7 +40,7 @@ void android_main(struct android_app *app) { } //NOLINTNEXTLINE -JNIEXPORT void JNICALL Java_com_cocos_lib_CocosActivity_onCreateNative(JNIEnv *env, jobject obj, jobject activity) { +JNIEXPORT void JNICALL Java_com_cocos_lib_CocosActivity_onCreateNative(JNIEnv *env, jobject activity) { cc::JniHelper::init(env, activity); } } diff --git a/native/cocos/platform/java/modules/SystemWindowManager.cpp b/native/cocos/platform/java/modules/SystemWindowManager.cpp index a8dffd9cba..023a1b35f0 100644 --- a/native/cocos/platform/java/modules/SystemWindowManager.cpp +++ b/native/cocos/platform/java/modules/SystemWindowManager.cpp @@ -45,7 +45,9 @@ ISystemWindow *SystemWindowManager::createWindow(const ISystemWindowInfo &info) if (!info.externalHandle || !isExternalHandleExist(info.externalHandle)) { ISystemWindow *window = BasePlatform::getPlatform()->createNativeWindow(_nextWindowId, info.externalHandle); if (window) { - window->createWindow(info.title.c_str(), info.x, info.y, info.width, info.height, info.flags); + if (!info.externalHandle) { + window->createWindow(info.title.c_str(), info.x, info.y, info.width, info.height, info.flags); + } _windows[_nextWindowId] = std::shared_ptr(window); _nextWindowId++; }