openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix saveState crash

Browse Source 
Signed-off-by: StreamBuns <zhaotong42@huawei.com>
This commit is contained in:
StreamBuns
2026-03-30 15:32:52 +08:00
parent 5d67cde3db
commit e1a6ea502b
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/ability/native/recovery/app_recovery.cpp
+23 -6
View File
@@ -46,6 +46,28 @@
namespace OHOS {
namespace AppExecFwk {
namespace{
static panda::ecmascript::EcmaVM* GetVMFromAbility(const std::shared_ptr<OHOS::AbilityRuntime::UIAbility>& abilityPtr)
{
if (!abilityPtr) {
return nullptr;
}
OHOS::AbilityRuntime::JsUIAbility& jsAbility = static_cast<AbilityRuntime::JsUIAbility&>(*abilityPtr);
AbilityRuntime::JsRuntime& runtime = const_cast<AbilityRuntime::JsRuntime&>(jsAbility.GetJsRuntime());
return runtime.GetEcmaVm();
}
void DisallowCrossThreadExecutionInRecovery()
{
#ifdef SUPPORT_SCREEN
panda::ecmascript::EcmaVM* vm = GetVMFromAbility(abilityPtr);
if (vm != nullptr) {
panda::JSNApi::DisallowCrossThreadExecution(vm);
}
#endif
}
}
std::mutex g_mutex;
std::atomic<bool> g_blocked = false;
const int DELAY_TIME = 1000;
@@ -244,9 +266,7 @@ bool AppRecovery::ExecuteFreezeCallbackWithVMSafety(const std::shared_ptr<OHOS::
return true;
}
#ifdef SUPPORT_SCREEN
OHOS::AbilityRuntime::JsUIAbility& jsAbility = static_cast<AbilityRuntime::JsUIAbility&>(*abilityPtr);
AbilityRuntime::JsRuntime& runtime = const_cast<AbilityRuntime::JsRuntime&>(jsAbility.GetJsRuntime());
panda::ecmascript::EcmaVM* vm = runtime.GetEcmaVm();
panda::ecmascript::EcmaVM* vm = GetVMFromAbility(abilityPtr);
if (!panda::JSNApi::CheckAndSetAllowCrossThreadExecution(vm)) {
TAG_LOGE(AAFwkTag::RECOVERY, "VM is in gc process");
return false;
@@ -256,9 +276,6 @@ bool AppRecovery::ExecuteFreezeCallbackWithVMSafety(const std::shared_ptr<OHOS::
this->freezeCallback();
TAG_LOGW(AAFwkTag::RECOVERY, "Freeze callback execution completed");
}
#ifdef SUPPORT_SCREEN
panda::JSNApi::DisallowCrossThreadExecution(vm);
#endif
return true;
}