openharmony/applications_settings
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_settings synced 2025-02-16 23:30:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!732 [自提单][settings]送检前加固保障3-告警清零

Browse Source 
Merge pull request !732 from 侯志雄/master
This commit is contained in:
openharmony_ci 2024-09-07 07:38:08 +00:00 committed by Gitee
commit f6cf6ce614
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
napi/settings/napi_settings.cpp
View File

@ -313,6 +313,8 @@ napi_value napi_get_uri(napi_env env, napi_callback_info info)
SETTING_LOG_INFO("uri c_b start asy work");
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
napi_delete_reference(env, asyncCallbackInfo->callbackRef);
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
@ -353,6 +355,7 @@ napi_value napi_get_uri(napi_env env, napi_callback_info info)
&asyncCallbackInfo->asyncWork);
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
@ -808,6 +811,9 @@ napi_value napi_get_value(napi_env env, napi_callback_info info)
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
napi_delete_reference(env, asyncCallbackInfo->callbackRef);
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
asyncCallbackInfo->dataAbilityHelper = nullptr;
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
@ -878,6 +884,8 @@ napi_value napi_get_value(napi_env env, napi_callback_info info)
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
asyncCallbackInfo->dataAbilityHelper = nullptr;
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
@ -962,7 +970,7 @@ napi_value napi_get_value_ext(napi_env env, napi_callback_info info, const bool
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
delete asyncCallbackInfo;
DeleteCallbackInfo(env, asyncCallbackInfo);
asyncCallbackInfo = nullptr;
}
}
@ -990,7 +998,7 @@ napi_value napi_get_value_ext(napi_env env, napi_callback_info info, const bool
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
delete asyncCallbackInfo;
DeleteCallbackInfo(env, asyncCallbackInfo);
asyncCallbackInfo = nullptr;
}
}
@ -1182,7 +1190,11 @@ napi_value SetValueAsync(napi_env env, AsyncCallbackInfo* asyncCallbackInfo)
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
napi_delete_reference(env, asyncCallbackInfo->callbackRef);
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
asyncCallbackInfo->dataAbilityHelper = nullptr;
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
}
SETTING_LOG_INFO("c_b set end asy work");
@ -1232,7 +1244,10 @@ napi_value SetValuePromise(napi_env env, AsyncCallbackInfo* asyncCallbackInfo)
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
asyncCallbackInfo->dataAbilityHelper = nullptr;
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
}
return promise;
@ -1395,7 +1410,7 @@ napi_value napi_set_value_ext(napi_env env, napi_callback_info info, const bool
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
delete asyncCallbackInfo;
DeleteCallbackInfo(env, asyncCallbackInfo);
asyncCallbackInfo = nullptr;
}
}
@ -1427,7 +1442,7 @@ napi_value napi_set_value_ext(napi_env env, napi_callback_info info, const bool
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
delete asyncCallbackInfo;
DeleteCallbackInfo(env, asyncCallbackInfo);
asyncCallbackInfo = nullptr;
}
}
@ -1525,6 +1540,8 @@ napi_value napi_enable_airplane_mode(napi_env env, napi_callback_info info)
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
napi_delete_reference(env, asyncCallbackInfo->callbackRef);
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
@ -1564,6 +1581,7 @@ napi_value napi_enable_airplane_mode(napi_env env, napi_callback_info info)
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
@ -1655,6 +1673,8 @@ napi_value napi_can_show_floating(napi_env env, napi_callback_info info)
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
napi_delete_reference(env, asyncCallbackInfo->callbackRef);
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}
@ -1701,6 +1721,7 @@ napi_value napi_can_show_floating(napi_env env, napi_callback_info info)
if (napi_queue_async_work(env, asyncCallbackInfo->asyncWork) != napi_ok) {
SETTING_LOG_ERROR("napi_queue_async_work error");
if (asyncCallbackInfo != nullptr) {
napi_delete_async_work(env, asyncCallbackInfo->asyncWork);
delete asyncCallbackInfo;
asyncCallbackInfo = nullptr;
}