Signed-off-by: sodanotgreen <limengzheng@huawei.com>
This commit is contained in:
sodanotgreen 2024-07-23 11:13:19 +08:00
parent 064b55c0da
commit ecae6fa437
7 changed files with 104 additions and 163 deletions

View File

@ -238,7 +238,6 @@ napi_value JsFeatureAbility::OnHasWindowFocus(napi_env env, const NapiCallbackIn
napi_value lastParam = (info.argc == ARGS_ZERO) ? nullptr : info.argv[PARAM0];
NapiAsyncTask::ScheduleHighQos("JSFeatureAbility::OnHasWindowFocus",
env, CreateAsyncTaskWithLastParam(env, lastParam, nullptr, std::move(complete), &result));
TAG_LOGD(AAFwkTag::FA, "end");
return result;
}
#endif
@ -450,7 +449,6 @@ napi_value NAPI_SetResult(napi_env env, napi_callback_info info)
}
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -481,7 +479,7 @@ napi_value SetResultWrap(napi_env env, napi_callback_info info, AsyncCallbackInf
} else {
ret = SetResultPromise(env, asyncCallbackInfo);
}
TAG_LOGI(AAFwkTag::FA, "end");
TAG_LOGD(AAFwkTag::FA, "end");
return ret;
}
@ -710,7 +708,7 @@ void CallOnAbilityResult(int requestCode, int resultCode, const Want &resultData
work = nullptr;
}
}
TAG_LOGI(AAFwkTag::FA, "end");
TAG_LOGD(AAFwkTag::FA, "end");
}
EXTERN_C_END
@ -760,12 +758,11 @@ napi_value UnwrapForResultParam(CallAbilityParam &param, napi_env env, napi_valu
if (!UnwrapAbilityStartSetting(env, jsSettingObj, *(param.setting))) {
TAG_LOGE(AAFwkTag::FA, "unwrap abilityStartSetting failed");
}
TAG_LOGI(AAFwkTag::FA, "abilityStartSetting");
TAG_LOGD(AAFwkTag::FA, "abilityStartSetting");
}
napi_value result;
NAPI_CALL(env, napi_create_int32(env, 1, &result));
TAG_LOGI(AAFwkTag::FA, "end");
return result;
}
@ -789,7 +786,6 @@ napi_value UnwrapAbilityResult(CallAbilityParam &param, napi_env env, napi_value
napi_value result;
NAPI_CALL(env, napi_create_int32(env, 1, &result));
TAG_LOGI(AAFwkTag::FA, "end");
return result;
}
@ -829,7 +825,6 @@ napi_value GetWantSyncWrap(napi_env env, napi_callback_info info, AsyncCallbackI
} else {
result = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return result;
}
@ -946,7 +941,7 @@ napi_value NAPI_GetDataAbilityHelper(napi_env env, napi_callback_info info)
}
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
TAG_LOGD(AAFwkTag::FA, "end");
return ret;
}
@ -989,7 +984,7 @@ napi_value GetDataAbilityHelperWrap(napi_env env, napi_callback_info info, DataA
} else {
ret = GetDataAbilityHelperPromise(env, dataAbilityHelperCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
TAG_LOGD(AAFwkTag::FA, "end");
return ret;
}
@ -1022,7 +1017,6 @@ napi_value GetDataAbilityHelperAsync(
napi_qos_user_initiated));
napi_value result = nullptr;
NAPI_CALL(env, napi_get_null(env, &result));
TAG_LOGI(AAFwkTag::FA, "asyncCallback end");
return result;
}
@ -1158,7 +1152,7 @@ napi_value NAPI_FAContinueAbility(napi_env env, napi_callback_info info)
}
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
TAG_LOGD(AAFwkTag::FA, "end");
return ret;
}
@ -1203,7 +1197,7 @@ napi_value ContinueAbilityWrap(napi_env env, napi_callback_info info, AsyncCallb
} else {
TAG_LOGE(AAFwkTag::FA, "Wrong argument count");
}
TAG_LOGI(AAFwkTag::FA, "end");
TAG_LOGD(AAFwkTag::FA, "end");
return ret;
}
@ -1362,7 +1356,7 @@ napi_value ContinueAbilityPromise(napi_env env, napi_value *args, AsyncCallbackI
},
static_cast<void *>(asyncCallbackInfo), &asyncCallbackInfo->asyncWork);
napi_queue_async_work(env, asyncCallbackInfo->asyncWork);
TAG_LOGI(AAFwkTag::FA, "promise end");
TAG_LOGD(AAFwkTag::FA, "end");
return promise;
}
} // namespace AppExecFwk

View File

@ -66,7 +66,7 @@ napi_value FAConstantInit(napi_env env, napi_value exports)
void SetNamedProperty(napi_env env, napi_value dstObj, const char *objName, const char *propName)
{
TAG_LOGD(AAFwkTag::FA, "start");
TAG_LOGD(AAFwkTag::FA, "called");
napi_value prop = nullptr;
napi_create_string_utf8(env, objName, NAPI_AUTO_LENGTH, &prop);
napi_set_named_property(env, dstObj, propName, prop);
@ -74,7 +74,7 @@ void SetNamedProperty(napi_env env, napi_value dstObj, const char *objName, cons
void SetNamedProperty(napi_env env, napi_value dstObj, const int32_t objValue, const char *propName)
{
TAG_LOGD(AAFwkTag::FA, "start");
TAG_LOGD(AAFwkTag::FA, "called");
napi_value prop = nullptr;
napi_create_int32(env, objValue, &prop);
napi_set_named_property(env, dstObj, propName, prop);

View File

@ -201,7 +201,6 @@ napi_value NAPI_Insert(napi_env env, napi_callback_info info)
insertCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -247,7 +246,6 @@ napi_value InsertWrap(napi_env env, napi_callback_info info, DAHelperInsertCB *i
} else {
ret = InsertPromise(env, insertCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -338,7 +336,6 @@ napi_value UnwrapValuesBucket(std::string &value, napi_env env, napi_value args)
napi_value result;
NAPI_CALL(env, napi_create_int32(env, 1, &result));
TAG_LOGI(AAFwkTag::FA, "end");
return result;
}
@ -366,7 +363,6 @@ napi_value NAPI_NotifyChange(napi_env env, napi_callback_info info)
notifyChangeCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -434,7 +430,6 @@ napi_value NAPI_Register(napi_env env, napi_callback_info info)
onCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -580,7 +575,6 @@ void RegisterCompleteCB(napi_env env, napi_status status, void *data)
}
TAG_LOGI(AAFwkTag::FA, "input params onCB will be release");
DeleteDAHelperOnOffCB(onCB);
TAG_LOGI(AAFwkTag::FA, "main event thread complete over an release invalid onCB");
}
/**
@ -607,7 +601,6 @@ napi_value NAPI_UnRegister(napi_env env, napi_callback_info info)
offCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "called end");
return ret;
}
@ -782,7 +775,6 @@ napi_value NAPI_GetType(napi_env env, napi_callback_info info)
gettypeCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -817,7 +809,6 @@ napi_value GetTypeWrap(napi_env env, napi_callback_info info, DAHelperGetTypeCB
} else {
ret = GetTypePromise(env, gettypeCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -841,7 +832,6 @@ napi_value NAPI_GetFileTypes(napi_env env, napi_callback_info info)
getfiletypesCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -881,7 +871,7 @@ napi_value GetFileTypesWrap(napi_env env, napi_callback_info info, DAHelperGetFi
} else {
ret = GetFileTypesPromise(env, getfiletypesCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -905,7 +895,7 @@ napi_value NAPI_NormalizeUri(napi_env env, napi_callback_info info)
normalizeuriCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -938,7 +928,7 @@ napi_value NormalizeUriWrap(napi_env env, napi_callback_info info, DAHelperNorma
} else {
ret = NormalizeUriPromise(env, normalizeuriCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -962,7 +952,7 @@ napi_value NAPI_DenormalizeUri(napi_env env, napi_callback_info info)
denormalizeuriCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -995,7 +985,7 @@ napi_value DenormalizeUriWrap(napi_env env, napi_callback_info info, DAHelperDen
} else {
ret = DenormalizeUriPromise(env, denormalizeuriCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1033,7 +1023,7 @@ napi_value NAPI_Delete(napi_env env, napi_callback_info info)
deleteCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1076,7 +1066,7 @@ napi_value DeleteWrap(napi_env env, napi_callback_info info, DAHelperDeleteCB *d
} else {
ret = DeletePromise(env, deleteCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1104,7 +1094,7 @@ napi_value NAPI_Update(napi_env env, napi_callback_info info)
updateCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1149,7 +1139,7 @@ napi_value UpdateWrap(napi_env env, napi_callback_info info, DAHelperUpdateCB *u
} else {
ret = UpdatePromise(env, updateCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
void SetPacMapObject(AppExecFwk::PacMap &pacMap, const napi_env &env, std::string keyStr, napi_value value)
@ -1281,7 +1271,7 @@ napi_value NAPI_Call(napi_env env, napi_callback_info info)
callCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1313,7 +1303,7 @@ napi_value NAPI_OpenFile(napi_env env, napi_callback_info info)
openFileCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1360,7 +1350,7 @@ napi_value OpenFileWrap(napi_env env, napi_callback_info info, DAHelperOpenFileC
} else {
ret = OpenFilePromise(env, openFileCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1392,7 +1382,7 @@ napi_value NAPI_BatchInsert(napi_env env, napi_callback_info info)
BatchInsertCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1430,7 +1420,7 @@ bool UnwrapArrayObjectFromJS(napi_env env, napi_value param, std::vector<NativeR
value.push_back(valueBucket);
}
TAG_LOGI(AAFwkTag::FA, "end");
return true;
}
@ -1473,7 +1463,7 @@ napi_value BatchInsertWrap(napi_env env, napi_callback_info info, DAHelperBatchI
} else {
ret = BatchInsertPromise(env, batchInsertCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1501,7 +1491,7 @@ napi_value NAPI_Query(napi_env env, napi_callback_info info)
queryCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1573,7 +1563,7 @@ napi_value NAPI_ExecuteBatch(napi_env env, napi_callback_info info)
executeBatchCB = nullptr;
ret = WrapVoidToJS(env);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}
@ -1641,7 +1631,7 @@ napi_value ExecuteBatchWrap(napi_env env, napi_callback_info info, DAHelperExecu
} else {
ret = ExecuteBatchPromise(env, executeBatchCB);
}
TAG_LOGI(AAFwkTag::FA, "end");
return ret;
}

View File

@ -82,13 +82,13 @@ napi_value InsertPromise(napi_env env, DAHelperInsertCB *insertCB)
static_cast<void *>(insertCB),
&insertCB->cbBase.asyncWork));
NAPI_CALL(env, napi_queue_async_work_with_qos(env, insertCB->cbBase.asyncWork, napi_qos_user_initiated));
TAG_LOGI(AAFwkTag::FA, "promise end");
TAG_LOGD(AAFwkTag::FA, "end");
return promise;
}
void InsertExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperInsertCB *insertCB = static_cast<DAHelperInsertCB *>(data);
if (insertCB == nullptr) {
TAG_LOGW(AAFwkTag::FA, "insertCB is nullptr");
@ -105,12 +105,11 @@ void InsertExecuteCB(napi_env env, void *data)
} else {
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
}
void InsertAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperInsertCB *insertCB = static_cast<DAHelperInsertCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -129,12 +128,12 @@ void InsertAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, insertCB->cbBase.asyncWork));
delete insertCB;
insertCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void InsertPromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperInsertCB *insertCB = static_cast<DAHelperInsertCB *>(data);
napi_value result = nullptr;
napi_create_int32(env, insertCB->result, &result);
@ -142,7 +141,7 @@ void InsertPromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, insertCB->cbBase.asyncWork));
delete insertCB;
insertCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
napi_value NotifyChangeAsync(
@ -221,7 +220,7 @@ void NotifyChangeExecuteCB(napi_env env, void *data)
void NotifyChangeAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperNotifyChangeCB *notifyChangeCB = static_cast<DAHelperNotifyChangeCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -251,7 +250,7 @@ void NotifyChangeAsyncCompleteCB(napi_env env, napi_status status, void *data)
void NotifyChangePromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperNotifyChangeCB *notifyChangeCB = static_cast<DAHelperNotifyChangeCB *>(data);
napi_value result = nullptr;
napi_create_int32(env, 0, &result);
@ -321,7 +320,7 @@ napi_value GetTypePromise(napi_env env, DAHelperGetTypeCB *gettypeCB)
void GetTypeExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperGetTypeCB *gettypeCB = static_cast<DAHelperGetTypeCB *>(data);
auto dataAbilityHelper = gettypeCB->dataAbilityHelper;
if (dataAbilityHelper != nullptr) {
@ -336,12 +335,11 @@ void GetTypeExecuteCB(napi_env env, void *data)
} else {
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
}
void GetTypeAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperGetTypeCB *gettypeCB = static_cast<DAHelperGetTypeCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -361,12 +359,12 @@ void GetTypeAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, gettypeCB->cbBase.asyncWork));
delete gettypeCB;
gettypeCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void GetTypePromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperGetTypeCB *gettypeCB = static_cast<DAHelperGetTypeCB *>(data);
napi_value result = nullptr;
NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, gettypeCB->result.c_str(), NAPI_AUTO_LENGTH, &result));
@ -374,7 +372,6 @@ void GetTypePromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, gettypeCB->cbBase.asyncWork));
delete gettypeCB;
gettypeCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
}
napi_value GetFileTypesAsync(
@ -438,7 +435,7 @@ napi_value GetFileTypesPromise(napi_env env, DAHelperGetFileTypesCB *getfiletype
void GetFileTypesExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperGetFileTypesCB *getfiletypesCB = static_cast<DAHelperGetFileTypesCB *>(data);
auto dataAbilityHelper = getfiletypesCB->dataAbilityHelper;
if (dataAbilityHelper != nullptr) {
@ -456,12 +453,12 @@ void GetFileTypesExecuteCB(napi_env env, void *data)
} else {
TAG_LOGI(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void GetFileTypesAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperGetFileTypesCB *getfiletypesCB = static_cast<DAHelperGetFileTypesCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -482,12 +479,11 @@ void GetFileTypesAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, getfiletypesCB->cbBase.asyncWork));
delete getfiletypesCB;
getfiletypesCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
}
void GetFileTypesPromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperGetFileTypesCB *getfiletypesCB = static_cast<DAHelperGetFileTypesCB *>(data);
napi_value result = nullptr;
@ -496,7 +492,6 @@ void GetFileTypesPromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, getfiletypesCB->cbBase.asyncWork));
delete getfiletypesCB;
getfiletypesCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
}
napi_value WrapGetFileTypesCB(napi_env env, const DAHelperGetFileTypesCB &getfiletypesCB)
@ -580,7 +575,7 @@ napi_value NormalizeUriPromise(napi_env env, DAHelperNormalizeUriCB *normalizeur
void NormalizeUriExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperNormalizeUriCB *normalizeuriCB = static_cast<DAHelperNormalizeUriCB *>(data);
Uri uriValue(normalizeuriCB->uri);
auto dataAbilityHelper = normalizeuriCB->dataAbilityHelper;
@ -593,14 +588,13 @@ void NormalizeUriExecuteCB(napi_env env, void *data)
normalizeuriCB->execResult = NO_ERROR;
}
} else {
TAG_LOGI(AAFwkTag::FA, "dataAbilityHelper == nullptr");
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
}
void NormalizeUriAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperNormalizeUriCB *normalizeuriCB = static_cast<DAHelperNormalizeUriCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -621,12 +615,11 @@ void NormalizeUriAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, normalizeuriCB->cbBase.asyncWork));
delete normalizeuriCB;
normalizeuriCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
}
void NormalizeUriPromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperNormalizeUriCB *normalizeuriCB = static_cast<DAHelperNormalizeUriCB *>(data);
napi_value result = nullptr;
NAPI_CALL_RETURN_VOID(env, napi_create_string_utf8(env, normalizeuriCB->result.c_str(), NAPI_AUTO_LENGTH, &result));
@ -634,7 +627,6 @@ void NormalizeUriPromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, normalizeuriCB->cbBase.asyncWork));
delete normalizeuriCB;
normalizeuriCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
}
napi_value DenormalizeUriAsync(
@ -698,7 +690,7 @@ napi_value DenormalizeUriPromise(napi_env env, DAHelperDenormalizeUriCB *denorma
void DenormalizeUriExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperDenormalizeUriCB *denormalizeuriCB = static_cast<DAHelperDenormalizeUriCB *>(data);
Uri uriValue(denormalizeuriCB->uri);
auto dataAbilityHelper = denormalizeuriCB->dataAbilityHelper;
@ -715,12 +707,12 @@ void DenormalizeUriExecuteCB(napi_env env, void *data)
} else {
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void DenormalizeUriAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperDenormalizeUriCB *denormalizeuriCB = static_cast<DAHelperDenormalizeUriCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -741,12 +733,12 @@ void DenormalizeUriAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, denormalizeuriCB->cbBase.asyncWork));
delete denormalizeuriCB;
denormalizeuriCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void DenormalizeUriPromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperDenormalizeUriCB *denormalizeuriCB = static_cast<DAHelperDenormalizeUriCB *>(data);
napi_value result = nullptr;
NAPI_CALL_RETURN_VOID(
@ -755,7 +747,7 @@ void DenormalizeUriPromiseCompleteCB(napi_env env, napi_status status, void *dat
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, denormalizeuriCB->cbBase.asyncWork));
delete denormalizeuriCB;
denormalizeuriCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
napi_value DeleteAsync(napi_env env, napi_value *args, const size_t argCallback, DAHelperDeleteCB *deleteCB)
@ -818,7 +810,7 @@ napi_value DeletePromise(napi_env env, DAHelperDeleteCB *deleteCB)
void DeleteExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperDeleteCB *deleteCB = static_cast<DAHelperDeleteCB *>(data);
auto dataAbilityHelper = deleteCB->dataAbilityHelper;
if (dataAbilityHelper != nullptr) {
@ -833,12 +825,12 @@ void DeleteExecuteCB(napi_env env, void *data)
} else {
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void DeleteAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperDeleteCB *DeleteCB = static_cast<DAHelperDeleteCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -857,12 +849,12 @@ void DeleteAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, DeleteCB->cbBase.asyncWork));
delete DeleteCB;
DeleteCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void DeletePromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperDeleteCB *DeleteCB = static_cast<DAHelperDeleteCB *>(data);
napi_value result = nullptr;
napi_create_int32(env, DeleteCB->result, &result);
@ -870,7 +862,7 @@ void DeletePromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, DeleteCB->cbBase.asyncWork));
delete DeleteCB;
DeleteCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
napi_value UpdateAsync(napi_env env, napi_value *args, const size_t argCallback, DAHelperUpdateCB *updateCB)
@ -933,7 +925,7 @@ napi_value UpdatePromise(napi_env env, DAHelperUpdateCB *updateCB)
void UpdateExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperUpdateCB *updateCB = static_cast<DAHelperUpdateCB *>(data);
auto dataAbilityHelper = updateCB->dataAbilityHelper;
if (dataAbilityHelper != nullptr) {
@ -948,12 +940,12 @@ void UpdateExecuteCB(napi_env env, void *data)
} else {
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void UpdateAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperUpdateCB *updateCB = static_cast<DAHelperUpdateCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -972,12 +964,12 @@ void UpdateAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, updateCB->cbBase.asyncWork));
delete updateCB;
updateCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void UpdatePromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperUpdateCB *updateCB = static_cast<DAHelperUpdateCB *>(data);
napi_value result = nullptr;
napi_create_int32(env, updateCB->result, &result);
@ -985,12 +977,12 @@ void UpdatePromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, updateCB->cbBase.asyncWork));
delete updateCB;
updateCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void CallErrorAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperErrorCB *errorCB = static_cast<DAHelperErrorCB *>(data);
if (errorCB != nullptr) {
napi_value callback = nullptr;
@ -1010,12 +1002,12 @@ void CallErrorAsyncCompleteCB(napi_env env, napi_status status, void *data)
}
delete errorCB;
errorCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void CallErrorPromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperErrorCB *errorCB = static_cast<DAHelperErrorCB *>(data);
if (errorCB != nullptr) {
napi_value result = nullptr;
@ -1025,19 +1017,18 @@ void CallErrorPromiseCompleteCB(napi_env env, napi_status status, void *data)
}
delete errorCB;
errorCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void CallErrorExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperErrorCB *errorCB = static_cast<DAHelperErrorCB *>(data);
if (errorCB != nullptr) {
errorCB->execResult = INVALID_PARAMETER;
} else {
TAG_LOGE(AAFwkTag::FA, "errorCB is null");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
}
napi_value CallErrorAsync(napi_env env, napi_value *args, const size_t argCallback, DAHelperErrorCB *errorCB)
@ -1112,7 +1103,7 @@ napi_value CallErrorWrap(napi_env env, napi_value thisVar, napi_callback_info in
void CallExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperCallCB *callCB = static_cast<DAHelperCallCB *>(data);
auto dataAbilityHelper = callCB->dataAbilityHelper;
if (dataAbilityHelper != nullptr) {
@ -1125,7 +1116,6 @@ void CallExecuteCB(napi_env env, void *data)
} else {
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
}
static std::string ExcludeTag(const std::string& jsonString, const std::string& tagString)
@ -1173,7 +1163,7 @@ napi_value CallPacMapValue(napi_env env, std::shared_ptr<AppExecFwk::PacMap> res
void CallAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperCallCB *callCB = static_cast<DAHelperCallCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -1192,12 +1182,12 @@ void CallAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, callCB->cbBase.asyncWork));
delete callCB;
callCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void CallPromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperCallCB *callCB = static_cast<DAHelperCallCB *>(data);
napi_value result = nullptr;
result = CallPacMapValue(env, callCB->result);
@ -1205,7 +1195,6 @@ void CallPromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, callCB->cbBase.asyncWork));
delete callCB;
callCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
}
napi_value CallAsync(napi_env env, napi_value *args, const size_t argCallback, DAHelperCallCB *callCB)
@ -1326,7 +1315,7 @@ napi_value OpenFilePromise(napi_env env, DAHelperOpenFileCB *openFileCB)
void OpenFileExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperOpenFileCB *OpenFileCB = static_cast<DAHelperOpenFileCB *>(data);
auto dataAbilityHelper = OpenFileCB->dataAbilityHelper;
if (dataAbilityHelper != nullptr) {
@ -1341,12 +1330,11 @@ void OpenFileExecuteCB(napi_env env, void *data)
} else {
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
}
void OpenFileAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperOpenFileCB *OpenFileCB = static_cast<DAHelperOpenFileCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -1365,12 +1353,11 @@ void OpenFileAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, OpenFileCB->cbBase.asyncWork));
delete OpenFileCB;
OpenFileCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
}
void OpenFilePromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperOpenFileCB *OpenFileCB = static_cast<DAHelperOpenFileCB *>(data);
napi_value result = nullptr;
napi_create_int32(env, OpenFileCB->result, &result);
@ -1378,7 +1365,6 @@ void OpenFilePromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, OpenFileCB->cbBase.asyncWork));
delete OpenFileCB;
OpenFileCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
}
napi_value BatchInsertAsync(
@ -1442,7 +1428,7 @@ napi_value BatchInsertPromise(napi_env env, DAHelperBatchInsertCB *batchInsertCB
void BatchInsertExecuteCB(napi_env env, void *data)
{
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute");
TAG_LOGI(AAFwkTag::FA, "call");
DAHelperBatchInsertCB *batchInsertCB = static_cast<DAHelperBatchInsertCB *>(data);
auto dataAbilityHelper = batchInsertCB->dataAbilityHelper;
if (dataAbilityHelper != nullptr) {
@ -1457,12 +1443,11 @@ void BatchInsertExecuteCB(napi_env env, void *data)
} else {
TAG_LOGE(AAFwkTag::FA, "dataAbilityHelper == nullptr");
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
}
void BatchInsertAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperBatchInsertCB *BatchInsertCB = static_cast<DAHelperBatchInsertCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -1481,12 +1466,12 @@ void BatchInsertAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, BatchInsertCB->cbBase.asyncWork));
delete BatchInsertCB;
BatchInsertCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void BatchInsertPromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperBatchInsertCB *BatchInsertCB = static_cast<DAHelperBatchInsertCB *>(data);
napi_value result = nullptr;
napi_create_int32(env, BatchInsertCB->result, &result);
@ -1494,7 +1479,7 @@ void BatchInsertPromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, BatchInsertCB->cbBase.asyncWork));
delete BatchInsertCB;
BatchInsertCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
napi_value QuerySync(napi_env env, napi_value *args, const size_t argCallback, DAHelperQueryCB *queryCB)
@ -1656,12 +1641,11 @@ void ExecuteBatchExecuteCB(napi_env env, void *data)
TAG_LOGI(AAFwkTag::FA, "%{public}s, dataAbilityHelper is not nullptr. %{public}zu",
__func__, executeBatchCB->result.size());
}
TAG_LOGI(AAFwkTag::FA, "worker pool thread execute end");
}
void ExecuteBatchAsyncCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete start");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperExecuteBatchCB *executeBatchCB = static_cast<DAHelperExecuteBatchCB *>(data);
napi_value callback = nullptr;
napi_value undefined = nullptr;
@ -1681,12 +1665,12 @@ void ExecuteBatchAsyncCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, executeBatchCB->cbBase.asyncWork));
delete executeBatchCB;
executeBatchCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void ExecuteBatchPromiseCompleteCB(napi_env env, napi_status status, void *data)
{
TAG_LOGI(AAFwkTag::FA, "main event thread complete start");
TAG_LOGI(AAFwkTag::FA, "called");
DAHelperExecuteBatchCB *executeBatchCB = static_cast<DAHelperExecuteBatchCB *>(data);
napi_value result = nullptr;
napi_create_array(env, &result);
@ -1695,7 +1679,7 @@ void ExecuteBatchPromiseCompleteCB(napi_env env, napi_status status, void *data)
NAPI_CALL_RETURN_VOID(env, napi_delete_async_work(env, executeBatchCB->cbBase.asyncWork));
delete executeBatchCB;
executeBatchCB = nullptr;
TAG_LOGI(AAFwkTag::FA, "main event thread complete end");
TAG_LOGD(AAFwkTag::FA, "end");
}
void GetDataAbilityResultForResult(

View File

@ -38,7 +38,7 @@ void NAPIDataAbilityObserver::ReleaseJSCallback()
}
SafeReleaseJSCallback();
TAG_LOGI(AAFwkTag::FA, "end");
}
void NAPIDataAbilityObserver::SafeReleaseJSCallback()
@ -100,13 +100,13 @@ void NAPIDataAbilityObserver::SafeReleaseJSCallback()
void NAPIDataAbilityObserver::SetEnv(const napi_env &env)
{
env_ = env;
TAG_LOGI(AAFwkTag::FA, "end");
}
void NAPIDataAbilityObserver::SetCallbackRef(const napi_ref &ref)
{
ref_ = ref;
TAG_LOGI(AAFwkTag::FA, "end");
}
static void OnChangeJSThreadWorker(uv_work_t *work, int status)
@ -132,7 +132,7 @@ static void OnChangeJSThreadWorker(uv_work_t *work, int status)
onCB = nullptr;
delete work;
work = nullptr;
TAG_LOGI(AAFwkTag::FA, "end");
}
void NAPIDataAbilityObserver::CallJsMethod()
@ -198,7 +198,7 @@ void NAPIDataAbilityObserver::OnChange()
work = nullptr;
}
}
TAG_LOGI(AAFwkTag::FA, "end");
}
} // namespace AppExecFwk

View File

@ -142,7 +142,7 @@ napi_value BuildDataAbilityOperation(
}
napi_value result;
NAPI_CALL(env, napi_create_int32(env, 1, &result));
TAG_LOGI(AAFwkTag::FA, "end");
return result;
}

View File

@ -33,6 +33,7 @@
#endif // WITH_DLP
#include "freeze_util.h"
#include "hilog_tag_wrapper.h"
#include "hilog_wrapper.h"
#include "hitrace_meter.h"
#include "ohos_application.h"
#ifdef SUPPORT_GRAPHICS
@ -422,7 +423,6 @@ void FAAbilityThread::AttachExtension(const std::shared_ptr<AppExecFwk::OHOSAppl
TAG_LOGE(AAFwkTag::FA, "failed err = %{public}d", err);
return;
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::Attach(const std::shared_ptr<AppExecFwk::OHOSApplication> &application,
@ -474,7 +474,6 @@ void FAAbilityThread::Attach(const std::shared_ptr<AppExecFwk::OHOSApplication>
BuildAbilityContext(abilityRecord->GetAbilityInfo(), application, token_, stageContext));
AttachInner(application, abilityRecord, stageContext);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleAbilityTransaction(
@ -494,7 +493,6 @@ void FAAbilityThread::HandleAbilityTransaction(
abilityImpl_->SetCallingContext(lifeCycleStateInfo.caller.deviceId, lifeCycleStateInfo.caller.bundleName,
lifeCycleStateInfo.caller.abilityName, lifeCycleStateInfo.caller.moduleName);
abilityImpl_->HandleAbilityTransaction(want, lifeCycleStateInfo, sessionInfo);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::AddLifecycleEvent(uint32_t state, std::string &methodName) const
@ -524,7 +522,6 @@ void FAAbilityThread::HandleShareData(const int32_t &uniqueId)
return;
}
abilityImpl_->HandleShareData(uniqueId);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleExtensionTransaction(
@ -537,7 +534,6 @@ void FAAbilityThread::HandleExtensionTransaction(
return;
}
extensionImpl_->HandleExtensionTransaction(want, lifeCycleStateInfo, sessionInfo);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleConnectAbility(const Want &want)
@ -554,7 +550,6 @@ void FAAbilityThread::HandleConnectAbility(const Want &want)
if (err != ERR_OK) {
TAG_LOGE(AAFwkTag::FA, "failed err = %{public}d", err);
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleDisconnectAbility(const Want &want)
@ -586,7 +581,6 @@ void FAAbilityThread::HandleCommandAbility(const Want &want, bool restart, int32
if (err != ERR_OK) {
TAG_LOGE(AAFwkTag::FA, "failed err = %{public}d", err);
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleConnectExtension(const Want &want)
@ -602,7 +596,6 @@ void FAAbilityThread::HandleConnectExtension(const Want &want)
if (!isAsyncCallback) {
extensionImpl_->ConnectExtensionCallback(service);
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleDisconnectExtension(const Want &want)
@ -619,7 +612,6 @@ void FAAbilityThread::HandleDisconnectExtension(const Want &want)
if (!isAsyncCallback) {
extensionImpl_->DisconnectExtensionCallback();
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleCommandExtension(const Want &want, bool restart, int32_t startId)
@ -635,7 +627,6 @@ void FAAbilityThread::HandleCommandExtension(const Want &want, bool restart, int
if (err != ERR_OK) {
TAG_LOGE(AAFwkTag::FA, "failed err = %{public}d", err);
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleCommandExtensionWindow(
@ -648,7 +639,6 @@ void FAAbilityThread::HandleCommandExtensionWindow(
return;
}
extensionImpl_->CommandExtensionWindow(want, sessionInfo, winCmd);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleRestoreAbilityState(const AppExecFwk::PacMap &state)
@ -660,7 +650,6 @@ void FAAbilityThread::HandleRestoreAbilityState(const AppExecFwk::PacMap &state)
}
abilityImpl_->DispatchRestoreAbilityState(state);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::ScheduleSaveAbilityState()
@ -672,7 +661,6 @@ void FAAbilityThread::ScheduleSaveAbilityState()
}
abilityImpl_->DispatchSaveAbilityState();
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::ScheduleRestoreAbilityState(const AppExecFwk::PacMap &state)
@ -683,7 +671,6 @@ void FAAbilityThread::ScheduleRestoreAbilityState(const AppExecFwk::PacMap &stat
return;
}
abilityImpl_->DispatchRestoreAbilityState(state);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::ScheduleUpdateConfiguration(const AppExecFwk::Configuration &config)
@ -711,7 +698,6 @@ void FAAbilityThread::ScheduleUpdateConfiguration(const AppExecFwk::Configuratio
if (!ret) {
TAG_LOGE(AAFwkTag::FA, "PostTask error");
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleUpdateConfiguration(const AppExecFwk::Configuration &config)
@ -723,7 +709,6 @@ void FAAbilityThread::HandleUpdateConfiguration(const AppExecFwk::Configuration
}
abilityImpl_->ScheduleUpdateConfiguration(config);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandleExtensionUpdateConfiguration(const AppExecFwk::Configuration &config)
@ -735,7 +720,6 @@ void FAAbilityThread::HandleExtensionUpdateConfiguration(const AppExecFwk::Confi
}
extensionImpl_->ScheduleUpdateConfiguration(config);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::ScheduleAbilityTransaction(
@ -828,7 +812,6 @@ void FAAbilityThread::ScheduleConnectAbility(const Want &want)
if (!ret) {
TAG_LOGE(AAFwkTag::FA, "PostTask error");
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::ScheduleDisconnectAbility(const Want &want)
@ -891,7 +874,6 @@ void FAAbilityThread::ScheduleCommandAbility(const Want &want, bool restart, int
if (!ret) {
TAG_LOGE(AAFwkTag::FA, "PostTask error");
}
TAG_LOGD(AAFwkTag::FA, "end");
}
bool FAAbilityThread::SchedulePrepareTerminateAbility()
@ -962,7 +944,6 @@ void FAAbilityThread::ScheduleCommandAbilityWindow(
if (!ret) {
TAG_LOGE(AAFwkTag::FA, "PostTask error");
}
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::SendResult(int requestCode, int resultCode, const Want &want)
@ -997,7 +978,6 @@ void FAAbilityThread::SendResult(int requestCode, int resultCode, const Want &wa
if (!ret) {
TAG_LOGE(AAFwkTag::FA, "PostTask error");
}
TAG_LOGD(AAFwkTag::FA, "end");
}
std::vector<std::string> FAAbilityThread::GetFileTypes(const Uri &uri, const std::string &mimeTypeFilter)
@ -1010,13 +990,12 @@ std::vector<std::string> FAAbilityThread::GetFileTypes(const Uri &uri, const std
}
types = abilityImpl_->GetFileTypes(uri, mimeTypeFilter);
TAG_LOGD(AAFwkTag::FA, "end");
return types;
}
int FAAbilityThread::OpenFile(const Uri &uri, const std::string &mode)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1026,7 +1005,7 @@ int FAAbilityThread::OpenFile(const Uri &uri, const std::string &mode)
int FAAbilityThread::OpenRawFile(const Uri &uri, const std::string &mode)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1037,7 +1016,7 @@ int FAAbilityThread::OpenRawFile(const Uri &uri, const std::string &mode)
int FAAbilityThread::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1049,7 +1028,7 @@ int FAAbilityThread::Insert(const Uri &uri, const NativeRdb::ValuesBucket &value
std::shared_ptr<AppExecFwk::PacMap> FAAbilityThread::Call(
const Uri &uri, const std::string &method, const std::string &arg, const AppExecFwk::PacMap &pacMap)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return nullptr;
@ -1061,7 +1040,7 @@ std::shared_ptr<AppExecFwk::PacMap> FAAbilityThread::Call(
int FAAbilityThread::Update(
const Uri &uri, const NativeRdb::ValuesBucket &value, const NativeRdb::DataAbilityPredicates &predicates)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1072,7 +1051,7 @@ int FAAbilityThread::Update(
int FAAbilityThread::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicates &predicates)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1083,7 +1062,7 @@ int FAAbilityThread::Delete(const Uri &uri, const NativeRdb::DataAbilityPredicat
std::shared_ptr<NativeRdb::AbsSharedResultSet> FAAbilityThread::Query(
const Uri &uri, std::vector<std::string> &columns, const NativeRdb::DataAbilityPredicates &predicates)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return nullptr;
@ -1094,7 +1073,7 @@ std::shared_ptr<NativeRdb::AbsSharedResultSet> FAAbilityThread::Query(
std::string FAAbilityThread::GetType(const Uri &uri)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
std::string type;
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
@ -1106,7 +1085,7 @@ std::string FAAbilityThread::GetType(const Uri &uri)
bool FAAbilityThread::Reload(const Uri &uri, const AppExecFwk::PacMap &extras)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return false;
@ -1116,7 +1095,7 @@ bool FAAbilityThread::Reload(const Uri &uri, const AppExecFwk::PacMap &extras)
int FAAbilityThread::BatchInsert(const Uri &uri, const std::vector<NativeRdb::ValuesBucket> &values)
{
TAG_LOGD(AAFwkTag::FA, "called");
TAG_LOGD(AAFwkTag::FA, "Called.");
if (abilityImpl_ == nullptr) {
TAG_LOGE(AAFwkTag::FA, "abilityImpl_ is nullptr");
return -1;
@ -1133,7 +1112,6 @@ void FAAbilityThread::ContinueAbility(const std::string &deviceId, uint32_t vers
return;
}
abilityImpl_->ContinueAbility(deviceId, versionCode);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::NotifyContinuationResult(int32_t result)
@ -1198,7 +1176,6 @@ Uri FAAbilityThread::NormalizeUri(const Uri &uri)
}
urivalue = abilityImpl_->NormalizeUri(uri);
TAG_LOGD(AAFwkTag::FA, "end");
return urivalue;
}
@ -1212,7 +1189,6 @@ Uri FAAbilityThread::DenormalizeUri(const Uri &uri)
}
urivalue = abilityImpl_->DenormalizeUri(uri);
TAG_LOGD(AAFwkTag::FA, "end");
return urivalue;
}
@ -1344,7 +1320,6 @@ std::vector<std::shared_ptr<AppExecFwk::DataAbilityResult>> FAAbilityThread::Exe
return results;
}
results = abilityImpl_->ExecuteBatch(operations);
TAG_LOGD(AAFwkTag::FA, "end");
return results;
}
@ -1424,7 +1399,6 @@ void FAAbilityThread::DumpAbilityInfoInner(const std::vector<std::string> &param
DumpOtherInfo(info);
return;
}
TAG_LOGD(AAFwkTag::FA, "end");
}
#else
void FAAbilityThread::DumpAbilityInfoInner(const std::vector<std::string> &params, std::vector<std::string> &info)
@ -1497,7 +1471,6 @@ void FAAbilityThread::CallRequest()
};
abilityHandler_->PostSyncTask(syncTask, "FAAbilityThread:CallRequest");
AbilityManagerClient::GetInstance()->CallRequestDone(token_, retval);
TAG_LOGD(AAFwkTag::FA, "end");
}
void FAAbilityThread::HandlePrepareTermianteAbility()