Merge branch 'v3.4.2' into v3.5.0_merge_v3.4.2

Conflicts:
	cocos/platform/android/jni/JniCocosActivity.cpp
	cocos/platform/apple/JsbBridgeWrapper.mm
	cocos/platform/ohos/jni/JniCocosAbility.cpp
	cocos/renderer/gfx-metal/MTLCommandBuffer.mm
	external/config.json
This commit is contained in:
minggo
2022-01-24 15:01:01 +08:00
43 changed files with 513 additions and 658 deletions
@@ -70,9 +70,6 @@ int32_t AndroidPlatform::loop() {
void AndroidPlatform::pollEvent() {
_jniNativeGlue->execCommand();
if (!_jniNativeGlue->isPause()) {
std::this_thread::yield();
}
_jniNativeGlue->flushTasksOnGameThread();
}