diff --git a/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp b/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp index 6f174b7ebd..2bccc4676a 100644 --- a/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp +++ b/native/cocos/platform/android/jni/JniCocosSurfaceView.cpp @@ -91,7 +91,10 @@ JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_destructNative(JNIEnv } JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSizeChangedNative(JNIEnv * /*env*/, jobject /*thiz*/, jint windowId, jint width, jint height) { // NOLINT JNI function name - cc::events::Resize::broadcast(width, height, windowId); + auto func = [width, height, windowId]() -> void { + cc::events::Resize::broadcast(width, height, windowId); + }; + CC_CURRENT_ENGINE()->getScheduler()->performFunctionInCocosThread(func); } JNIEXPORT void JNICALL Java_com_cocos_lib_CocosSurfaceView_onSurfaceRedrawNeededNative(JNIEnv * /*env*/, jobject /*thiz*/, jlong handle) { // NOLINT JNI function name diff --git a/native/cocos/platform/java/modules/SystemWindow.cpp b/native/cocos/platform/java/modules/SystemWindow.cpp index 107a6c6a6b..4fc4e66c69 100644 --- a/native/cocos/platform/java/modules/SystemWindow.cpp +++ b/native/cocos/platform/java/modules/SystemWindow.cpp @@ -60,12 +60,16 @@ void SystemWindow::copyTextToClipboard(const ccstd::string &text) { void SystemWindow::setWindowHandle(void *handle) { #if (CC_PLATFORM == CC_PLATFORM_ANDROID) - std::lock_guard lock(_handleMutex); + //The getWindowHandle interface may have been called earlier, causing _handleMutex to be occupied all the time. + bool lockSuccess = _handleMutex.try_lock(); bool needNotify = _windowHandle == nullptr; _windowHandle = handle; if (needNotify) { _windowHandlePromise.set_value(); } + if (lockSuccess) { + _handleMutex.unlock(); + } #else _windowHandle = handle; #endif