diff --git a/interfaces/inner_api/native/backup_kit_inner/impl/svc_death_recipient.h b/interfaces/inner_api/native/backup_kit_inner/impl/svc_death_recipient.h index d7d9d294da68df2612f36fa3e6ca1ab675fb93e5..4f318b47471442c377e9ba14b4b794d5cac749e2 100644 --- a/interfaces/inner_api/native/backup_kit_inner/impl/svc_death_recipient.h +++ b/interfaces/inner_api/native/backup_kit_inner/impl/svc_death_recipient.h @@ -25,8 +25,8 @@ class SvcDeathRecipient : public IRemoteObject::DeathRecipient { public: void OnRemoteDied(const wptr &object) override { - object->RemoveDeathRecipient(this); functor_(object); + object->RemoveDeathRecipient(this); }; public: diff --git a/interfaces/kits/js/backup/general_callbacks.h b/interfaces/kits/js/backup/general_callbacks.h index 4fc20530f00b834dac7edaf6c68580f0a53213b9..fdcd560aee8aa2f9b0acbce7b70ccdfb1a52faec 100644 --- a/interfaces/kits/js/backup/general_callbacks.h +++ b/interfaces/kits/js/backup/general_callbacks.h @@ -59,7 +59,7 @@ public: LibN::NAsyncWorkCallback onBundleBegin; LibN::NAsyncWorkCallback onBundleEnd; LibN::NAsyncWorkCallback onAllBundlesEnd; - LibN::NAsyncWorkCallback onBackupServiceDied; + BackupRestoreCallback onBackupServiceDied; BackupRestoreCallback onResultReport; BackupRestoreCallback onProcess; }; diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index 7976c8fdb85e6088bd6982b6f1fe569039a57577..7f8e99ccdfa70237844a29d34dbac51c94db9f79 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -266,11 +266,13 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) return; } - auto cbCompl = [](napi_env env, NError err) -> NVal { - return err ? NVal {env, err.GetNapiErr(env)} : NVal::CreateUndefined(env); + auto cbCompl = [](napi_env env, vector &argv) -> bool { + napi_value napi_res = nullptr; + napi_get_undefined(env, &napi_res); + argv.push_back(napi_res); + return true; }; - - callbacks->onBackupServiceDied.ThreadSafeSchedule(cbCompl); + callbacks->onBackupServiceDied.CallJsMethod(cbCompl); } static void OnProcess(weak_ptr pCallbacks, const BundleName name, const std::string processInfo) diff --git a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp index 1a3d9bd95cd4cde1fc4f01031ef7b247a09c914c..2596a6e6c4e26fcc7afc02ca26aa5f71242aeb2b 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -272,11 +272,13 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) return; } - auto cbCompl = [](napi_env env, NError err) -> NVal { - return err ? NVal {env, err.GetNapiErr(env)} : NVal::CreateUndefined(env); + auto cbCompl = [](napi_env env, vector &argv) -> bool { + napi_value napi_res = nullptr; + napi_get_undefined(env, &napi_res); + argv.push_back(napi_res); + return true; }; - - callbacks->onBackupServiceDied.ThreadSafeSchedule(cbCompl); + callbacks->onBackupServiceDied.CallJsMethod(cbCompl); } static void OnProcess(weak_ptr pCallbacks, const BundleName name, const std::string processInfo) diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index aa02679a79225a0204c27afbdd02f9271a3fcefe..d8586dc17273acfa0d0cab109d925a03c2d97c65 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -245,11 +245,13 @@ static void OnBackupServiceDied(weak_ptr pCallbacks) return; } - auto cbCompl = [](napi_env env, NError err) -> NVal { - return err ? NVal {env, err.GetNapiErr(env)} : NVal::CreateUndefined(env); + auto cbCompl = [](napi_env env, vector &argv) -> bool { + napi_value napi_res = nullptr; + napi_get_undefined(env, &napi_res); + argv.push_back(napi_res); + return true; }; - - callbacks->onBackupServiceDied.ThreadSafeSchedule(cbCompl); + callbacks->onBackupServiceDied.CallJsMethod(cbCompl); } static void OnResultReport(weak_ptr pCallbacks, const std::string bundleName,