From 05eed90d590aba6e49dcbc130a3c1cb0852b08ba Mon Sep 17 00:00:00 2001 From: sunjiakun Date: Mon, 30 Dec 2024 15:31:44 +0800 Subject: [PATCH] toplog15-27 Signed-off-by: sunjiakun --- .../src/app_control/app_control_host.cpp | 4 +- .../src/app_control/app_control_proxy.cpp | 24 ++++++--- .../src/default_app/default_app_host.cpp | 4 +- .../src/default_app/default_app_proxy.cpp | 3 +- .../src/overlay/overlay_manager_host.cpp | 8 +-- .../src/overlay/overlay_manager_proxy.cpp | 23 ++++----- .../kits/js/app_control/js_app_control.cpp | 49 ++++++++++--------- .../kits/js/default_app/js_default_app.cpp | 12 +++-- interfaces/kits/js/overlay/js_app_overlay.cpp | 30 ++++++------ .../app_control_manager_host_impl.cpp | 40 +++++++++------ .../app_control/app_control_manager_rdb.cpp | 26 ++++++---- services/bundlemgr/src/bundle_data_mgr.cpp | 3 +- .../bundlemgr/src/bundle_permission_mgr.cpp | 5 +- .../src/default_app/default_app_mgr.cpp | 2 + .../overlay/bundle_overlay_data_manager.cpp | 11 ++++- .../bundlemgr/src/rdb/rdb_data_manager.cpp | 19 ++++--- 16 files changed, 155 insertions(+), 108 deletions(-) diff --git a/interfaces/inner_api/appexecfwk_core/src/app_control/app_control_host.cpp b/interfaces/inner_api/appexecfwk_core/src/app_control/app_control_host.cpp index b8ee6e6e6e..932b83b90f 100644 --- a/interfaces/inner_api/appexecfwk_core/src/app_control/app_control_host.cpp +++ b/interfaces/inner_api/appexecfwk_core/src/app_control/app_control_host.cpp @@ -40,7 +40,7 @@ int AppControlHost::OnRemoteRequest( uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { BundleMemoryGuard memoryGuard; - LOG_I(BMS_TAG_DEFAULT, "AppControlHost OnRemoteRequest, message code : %{public}u", code); + LOG_I(BMS_TAG_DEFAULT, "message code : %{public}u", code); std::u16string descriptor = AppControlHost::GetDescriptor(); std::u16string remoteDescriptor = data.ReadInterfaceToken(); if (descriptor != remoteDescriptor) { @@ -104,7 +104,7 @@ int AppControlHost::OnRemoteRequest( case static_cast(AppControlManagerInterfaceCode::DELETE_UNINSTALL_DISPOSED_RULE): return HandleDeleteUninstallDisposedRule(data, reply); default: - LOG_W(BMS_TAG_DEFAULT, "AppControlHost receive unknown code, code = %{public}d", code); + LOG_W(BMS_TAG_DEFAULT, "unknown code:%{public}d", code); return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } } diff --git a/interfaces/inner_api/appexecfwk_core/src/app_control/app_control_proxy.cpp b/interfaces/inner_api/appexecfwk_core/src/app_control/app_control_proxy.cpp index 3666bc096b..1b032bda89 100644 --- a/interfaces/inner_api/appexecfwk_core/src/app_control/app_control_proxy.cpp +++ b/interfaces/inner_api/appexecfwk_core/src/app_control/app_control_proxy.cpp @@ -376,7 +376,7 @@ ErrCode AppControlProxy::GetAppJumpControlRule(const std::string &callerBundleNa ErrCode AppControlProxy::SetDisposedStatus( const std::string &appId, const Want &want, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "proxy begin to SetDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { LOG_E(BMS_TAG_DEFAULT, "WriteInterfaceToken failed"); @@ -405,12 +405,13 @@ ErrCode AppControlProxy::SetDisposedStatus( LOG_E(BMS_TAG_DEFAULT, "host return error : %{public}d", ret); return ret; } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlProxy::DeleteDisposedStatus(const std::string &appId, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "proxy begin to DeleteDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { LOG_E(BMS_TAG_DEFAULT, "WriteInterfaceToken failed"); @@ -435,12 +436,13 @@ ErrCode AppControlProxy::DeleteDisposedStatus(const std::string &appId, int32_t LOG_E(BMS_TAG_DEFAULT, "host return error : %{public}d", ret); return ret; } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlProxy::GetDisposedStatus(const std::string &appId, Want &want, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "proxy begin to GetDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { LOG_E(BMS_TAG_DEFAULT, "WriteInterfaceToken failed"); @@ -459,13 +461,14 @@ ErrCode AppControlProxy::GetDisposedStatus(const std::string &appId, Want &want, LOG_E(BMS_TAG_DEFAULT, "host return error : %{public}d", ret); return ret; } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlProxy::SetDisposedRule( const std::string &appId, DisposedRule &disposedRule, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "proxy begin to SetDisposedRule."); + LOG_D(BMS_TAG_DEFAULT, "begin"); MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { LOG_E(BMS_TAG_DEFAULT, "WriteInterfaceToken failed."); @@ -494,12 +497,13 @@ ErrCode AppControlProxy::SetDisposedRule( LOG_E(BMS_TAG_DEFAULT, "host return error : %{public}d", ret); return ret; } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlProxy::GetDisposedRule(const std::string &appId, DisposedRule &rule, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "proxy begin to GetDisposedRule"); + LOG_D(BMS_TAG_DEFAULT, "begin"); MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { LOG_E(BMS_TAG_DEFAULT, "WriteInterfaceToken failed"); @@ -518,6 +522,7 @@ ErrCode AppControlProxy::GetDisposedRule(const std::string &appId, DisposedRule LOG_E(BMS_TAG_DEFAULT, "host return error : %{public}d", ret); return ret; } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } @@ -548,7 +553,7 @@ ErrCode AppControlProxy::GetAbilityRunningControlRule( ErrCode AppControlProxy::SetDisposedRuleForCloneApp( const std::string &appId, DisposedRule &disposedRule, int32_t appIndex, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "proxy begin to SetDisposedRuleForCloneApp"); + LOG_D(BMS_TAG_DEFAULT, "begin"); MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { LOG_E(BMS_TAG_DEFAULT, "WriteInterfaceToken failed"); @@ -581,13 +586,14 @@ ErrCode AppControlProxy::SetDisposedRuleForCloneApp( LOG_E(BMS_TAG_DEFAULT, "host return error : %{public}d", ret); return ret; } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlProxy::GetDisposedRuleForCloneApp(const std::string &appId, DisposedRule &rule, int32_t appIndex, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "proxy begin to GetDisposedRuleForCloneApp"); + LOG_D(BMS_TAG_DEFAULT, "begin"); MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { LOG_E(BMS_TAG_DEFAULT, "WriteInterfaceToken failed"); @@ -611,12 +617,13 @@ ErrCode AppControlProxy::GetDisposedRuleForCloneApp(const std::string &appId, Di LOG_E(BMS_TAG_DEFAULT, "host return error : %{public}d", ret); return ret; } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlProxy::DeleteDisposedRuleForCloneApp(const std::string &appId, int32_t appIndex, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "proxy begin to DeleteDisposedRuleForCloneApp"); + LOG_D(BMS_TAG_DEFAULT, "begin"); MessageParcel data; if (!data.WriteInterfaceToken(GetDescriptor())) { LOG_E(BMS_TAG_DEFAULT, "WriteInterfaceToken failed"); @@ -645,6 +652,7 @@ ErrCode AppControlProxy::DeleteDisposedRuleForCloneApp(const std::string &appId, LOG_E(BMS_TAG_DEFAULT, "host return error : %{public}d", ret); return ret; } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } diff --git a/interfaces/inner_api/appexecfwk_core/src/default_app/default_app_host.cpp b/interfaces/inner_api/appexecfwk_core/src/default_app/default_app_host.cpp index 8249f62b88..de0b28290b 100644 --- a/interfaces/inner_api/appexecfwk_core/src/default_app/default_app_host.cpp +++ b/interfaces/inner_api/appexecfwk_core/src/default_app/default_app_host.cpp @@ -39,7 +39,7 @@ int DefaultAppHost::OnRemoteRequest( uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { BundleMemoryGuard memoryGuard; - LOG_I(BMS_TAG_DEFAULT, "DefaultAppHost OnRemoteRequest, message code : %{public}u", code); + LOG_I(BMS_TAG_DEFAULT, "message code : %{public}u", code); std::u16string descriptor = DefaultAppHost::GetDescriptor(); std::u16string remoteDescriptor = data.ReadInterfaceToken(); if (descriptor != remoteDescriptor) { @@ -57,7 +57,7 @@ int DefaultAppHost::OnRemoteRequest( case static_cast(DefaultAppInterfaceCode::RESET_DEFAULT_APPLICATION): return HandleResetDefaultApplication(data, reply); default: - LOG_W(BMS_TAG_DEFAULT, "DefaultAppHost receive unknown code, code = %{public}d", code); + LOG_W(BMS_TAG_DEFAULT, "unknown code:%{public}d", code); return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } } diff --git a/interfaces/inner_api/appexecfwk_core/src/default_app/default_app_proxy.cpp b/interfaces/inner_api/appexecfwk_core/src/default_app/default_app_proxy.cpp index 1fa2ce9478..7bb35a488a 100644 --- a/interfaces/inner_api/appexecfwk_core/src/default_app/default_app_proxy.cpp +++ b/interfaces/inner_api/appexecfwk_core/src/default_app/default_app_proxy.cpp @@ -37,7 +37,7 @@ DefaultAppProxy::~DefaultAppProxy() ErrCode DefaultAppProxy::IsDefaultApplication(const std::string& type, bool& isDefaultApp) { - LOG_D(BMS_TAG_DEFAULT, "begin to call IsDefaultApplication"); + LOG_D(BMS_TAG_DEFAULT, "begin"); HITRACE_METER_NAME(HITRACE_TAG_APP, __PRETTY_FUNCTION__); MessageParcel data; @@ -59,6 +59,7 @@ ErrCode DefaultAppProxy::IsDefaultApplication(const std::string& type, bool& isD if (ret == ERR_OK) { isDefaultApp = reply.ReadBool(); } + LOG_D(BMS_TAG_DEFAULT, "end"); return ret; } diff --git a/interfaces/inner_api/appexecfwk_core/src/overlay/overlay_manager_host.cpp b/interfaces/inner_api/appexecfwk_core/src/overlay/overlay_manager_host.cpp index f2b9772460..a1a155719d 100644 --- a/interfaces/inner_api/appexecfwk_core/src/overlay/overlay_manager_host.cpp +++ b/interfaces/inner_api/appexecfwk_core/src/overlay/overlay_manager_host.cpp @@ -38,11 +38,11 @@ int OverlayManagerHost::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) { BundleMemoryGuard memoryGuard; - APP_LOGD("bundle mgr host onReceived message, the message code is %{public}u", code); + APP_LOGD("message code:%{public}u", code); std::u16string descriptor = OverlayManagerHost::GetDescriptor(); std::u16string remoteDescriptor = data.ReadInterfaceToken(); if (descriptor != remoteDescriptor) { - APP_LOGE("fail to write reply message in bundle mgr host due to the reply is nullptr"); + APP_LOGE("descriptor != remoteDescriptor"); return OBJECT_NULL; } @@ -76,10 +76,10 @@ int OverlayManagerHost::OnRemoteRequest(uint32_t code, MessageParcel& data, errCode = this->HandleSetOverlayEnabledForSelf(data, reply); break; default : - APP_LOGW("overlayMgr host receives unknown code %{public}u", code); + APP_LOGW("unknown code:%{public}u", code); return IPCObjectStub::OnRemoteRequest(code, data, reply, option); } - APP_LOGD("overlayMgr host finish to process message"); + APP_LOGD("end,errCode:%{public}d", errCode); return (errCode == ERR_OK) ? NO_ERROR : UNKNOWN_ERROR; } diff --git a/interfaces/inner_api/appexecfwk_core/src/overlay/overlay_manager_proxy.cpp b/interfaces/inner_api/appexecfwk_core/src/overlay/overlay_manager_proxy.cpp index 2b1d7313d7..656dec3b63 100644 --- a/interfaces/inner_api/appexecfwk_core/src/overlay/overlay_manager_proxy.cpp +++ b/interfaces/inner_api/appexecfwk_core/src/overlay/overlay_manager_proxy.cpp @@ -98,11 +98,11 @@ ErrCode OverlayManagerProxy::GetOverlayModuleInfo(const std::string &bundleName, ErrCode OverlayManagerProxy::GetOverlayModuleInfo(const std::string &moduleName, OverlayModuleInfo &overlayModuleInfo, int32_t userId) { - APP_LOGD("begin to call GetOverlayModuleInfo"); + APP_LOGD("begin without bundleName"); HITRACE_METER_NAME(HITRACE_TAG_APP, __PRETTY_FUNCTION__); if (moduleName.empty()) { - APP_LOGE("GetOverlayModuleInfo failed due to params error"); + APP_LOGE("moduleName empty"); return ERR_BUNDLEMANAGER_OVERLAY_QUERY_FAILED_PARAM_ERROR; } @@ -116,7 +116,7 @@ ErrCode OverlayManagerProxy::GetOverlayModuleInfo(const std::string &moduleName, return ERR_APPEXECFWK_PARCEL_ERROR; } if (!data.WriteInt32(userId)) { - APP_LOGE("failed to GetOverlayModuleInfo due to write userId fail"); + APP_LOGE("write userId failed"); return ERR_APPEXECFWK_PARCEL_ERROR; } @@ -126,11 +126,11 @@ ErrCode OverlayManagerProxy::GetOverlayModuleInfo(const std::string &moduleName, ErrCode OverlayManagerProxy::GetTargetOverlayModuleInfo(const std::string &targetModuleName, std::vector &overlayModuleInfos, int32_t userId) { - APP_LOGD("begin to call GetTargetOverlayModuleInfo"); + APP_LOGD("begin"); HITRACE_METER_NAME(HITRACE_TAG_APP, __PRETTY_FUNCTION__); if (targetModuleName.empty()) { - APP_LOGE("GetTargetOverlayModuleInfo failed due to params error"); + APP_LOGE("targetModuleName empty"); return ERR_BUNDLEMANAGER_OVERLAY_QUERY_FAILED_PARAM_ERROR; } @@ -145,7 +145,7 @@ ErrCode OverlayManagerProxy::GetTargetOverlayModuleInfo(const std::string &targe return ERR_APPEXECFWK_PARCEL_ERROR; } if (!data.WriteInt32(userId)) { - APP_LOGE("failed to GetTargetOverlayModuleInfo due to write userId fail"); + APP_LOGE("write userId failed"); return ERR_APPEXECFWK_PARCEL_ERROR; } @@ -264,10 +264,10 @@ ErrCode OverlayManagerProxy::SetOverlayEnabledForSelf(const std::string &moduleN ErrCode OverlayManagerProxy::SetOverlayEnabled(const std::string &bundleName, const std::string &moduleName, bool isEnabled, int32_t userId) { - APP_LOGD("begin to call SetOverlayEnabled"); + APP_LOGD("begin"); HITRACE_METER_NAME(HITRACE_TAG_APP, __PRETTY_FUNCTION__); if (bundleName.empty() || moduleName.empty()) { - APP_LOGE("SetOverlayEnabled failed due to params error"); + APP_LOGE("params empty"); return ERR_BUNDLEMANAGER_OVERLAY_SET_OVERLAY_PARAM_ERROR; } @@ -285,11 +285,11 @@ ErrCode OverlayManagerProxy::SetOverlayEnabled(const std::string &bundleName, co return ERR_APPEXECFWK_PARCEL_ERROR; } if (!data.WriteBool(isEnabled)) { - APP_LOGE("failed to SetOverlayEnabled due to write isEnabled fail"); + APP_LOGE("write isEnabled failed"); return ERR_APPEXECFWK_PARCEL_ERROR; } if (!data.WriteInt32(userId)) { - APP_LOGE("failed to SetOverlayEnabled due to write userId fail"); + APP_LOGE("write userId failed"); return ERR_APPEXECFWK_PARCEL_ERROR; } @@ -300,8 +300,9 @@ ErrCode OverlayManagerProxy::SetOverlayEnabled(const std::string &bundleName, co } auto res = reply.ReadInt32(); if (res != ERR_OK) { - APP_LOGE("failed SetOverlayEnabled %{public}d", res); + APP_LOGE("read reply failed %{public}d", res); } + APP_LOGD("end"); return res; } diff --git a/interfaces/kits/js/app_control/js_app_control.cpp b/interfaces/kits/js/app_control/js_app_control.cpp index 74d56b4fcc..100ae57fbd 100644 --- a/interfaces/kits/js/app_control/js_app_control.cpp +++ b/interfaces/kits/js/app_control/js_app_control.cpp @@ -136,11 +136,11 @@ void SetDisposedStatusComplete(napi_env env, napi_status status, void *data) napi_value SetDisposedStatus(napi_env env, napi_callback_info info) { - APP_LOGD("begin to SetDisposedStatus"); + APP_LOGD("begin"); NapiArg args(env, info); DisposedStatus *asyncCallbackInfo = new (std::nothrow) DisposedStatus(env); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null"); + APP_LOGE("null asyncCallbackInfo"); return nullptr; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -169,10 +169,10 @@ napi_value SetDisposedStatus(napi_env env, napi_callback_info info) if (valueType == napi_function) { NAPI_CALL(env, napi_create_reference(env, args[i], NAPI_RETURN_ONE, &asyncCallbackInfo->callback)); } else { - APP_LOGD("SetDisposedStatus extra arg ignored"); + APP_LOGD("extra arg ignored"); } } else { - APP_LOGE("SetDisposedStatus arg err"); + APP_LOGE("arg err"); BusinessError::ThrowError(env, ERROR_PARAM_CHECK_ERROR, PARAM_TYPE_CHECK_ERROR); return nullptr; } @@ -180,13 +180,13 @@ napi_value SetDisposedStatus(napi_env env, napi_callback_info info) auto promise = CommonFunc::AsyncCallNativeMethod( env, asyncCallbackInfo, "SetDisposedStatus", SetDisposedStatusExec, SetDisposedStatusComplete); callbackPtr.release(); - APP_LOGD("call SetDisposedStatus done"); + APP_LOGD("end"); return promise; } napi_value SetDisposedStatusSync(napi_env env, napi_callback_info info) { - APP_LOGD("begin to SetDisposedStatusSync"); + APP_LOGD("begin"); NapiArg args(env, info); napi_value nRet; napi_get_undefined(env, &nRet); @@ -215,7 +215,7 @@ napi_value SetDisposedStatusSync(napi_env env, napi_callback_info info) } auto appControlProxy = GetAppControlProxy(); if (appControlProxy == nullptr) { - APP_LOGE("AppControlProxy is null"); + APP_LOGE("null appControlProxy"); napi_value error = BusinessError::CreateCommonError(env, ERROR_SYSTEM_ABILITY_NOT_FOUND, SET_DISPOSED_STATUS_SYNC); napi_throw(env, error); @@ -229,7 +229,7 @@ napi_value SetDisposedStatusSync(napi_env env, napi_callback_info info) env, ret, SET_DISPOSED_STATUS_SYNC, PERMISSION_DISPOSED_STATUS); napi_throw(env, businessError); } - APP_LOGD("call SetDisposedStatusSync done"); + APP_LOGD("end"); return nRet; } @@ -266,11 +266,11 @@ void DeleteDisposedStatusComplete(napi_env env, napi_status, void *data) napi_value DeleteDisposedStatus(napi_env env, napi_callback_info info) { - APP_LOGD("begin to DeleteDisposedStatus"); + APP_LOGD("begin"); NapiArg args(env, info); DisposedStatus *asyncCallbackInfo = new (std::nothrow) DisposedStatus(env); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null"); + APP_LOGE("null asyncCallbackInfo"); return nullptr; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -295,10 +295,10 @@ napi_value DeleteDisposedStatus(napi_env env, napi_callback_info info) if (valueType == napi_function) { NAPI_CALL(env, napi_create_reference(env, args[i], NAPI_RETURN_ONE, &asyncCallbackInfo->callback)); } else { - APP_LOGD("DeleteDisposedStatus extra arg ignored"); + APP_LOGD("extra arg ignored"); } } else { - APP_LOGE("DeleteDisposedStatus arg err"); + APP_LOGE("arg err"); BusinessError::ThrowError(env, ERROR_PARAM_CHECK_ERROR, PARAM_TYPE_CHECK_ERROR); return nullptr; } @@ -306,7 +306,7 @@ napi_value DeleteDisposedStatus(napi_env env, napi_callback_info info) auto promise = CommonFunc::AsyncCallNativeMethod( env, asyncCallbackInfo, "DeleteDisposedStatus", DeleteDisposedStatusExec, DeleteDisposedStatusComplete); callbackPtr.release(); - APP_LOGD("call DeleteDisposedStatus done"); + APP_LOGD("end"); return promise; } @@ -347,7 +347,7 @@ static napi_value InnerDeleteDisposedStatusSync(napi_env env, std::string &appId napi_value DeleteDisposedStatusSync(napi_env env, napi_callback_info info) { - APP_LOGD("begin to DeleteDisposedStatusSync"); + APP_LOGD("begin"); NapiArg args(env, info); napi_value nRet; napi_get_undefined(env, &nRet); @@ -413,11 +413,11 @@ void GetDisposedStatusComplete(napi_env env, napi_status status, void *data) napi_value GetDisposedStatus(napi_env env, napi_callback_info info) { - APP_LOGD("NAPI GetDisposedStatus called"); + APP_LOGD("begin"); NapiArg args(env, info); DisposedStatus *asyncCallbackInfo = new (std::nothrow) DisposedStatus(env); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null"); + APP_LOGE("null asyncCallbackInfo"); return nullptr; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -453,13 +453,13 @@ napi_value GetDisposedStatus(napi_env env, napi_callback_info info) auto promise = CommonFunc::AsyncCallNativeMethod( env, asyncCallbackInfo, "GetDisposedStatus", GetDisposedStatusExec, GetDisposedStatusComplete); callbackPtr.release(); - APP_LOGD("call GetDisposedStatus done"); + APP_LOGD("end"); return promise; } napi_value GetDisposedStatusSync(napi_env env, napi_callback_info info) { - APP_LOGD("NAPI GetDisposedStatusSync called"); + APP_LOGD("begin"); NapiArg args(env, info); if (!args.Init(ARGS_SIZE_ONE, ARGS_SIZE_ONE)) { APP_LOGE("param count invalid"); @@ -476,11 +476,12 @@ napi_value GetDisposedStatusSync(napi_env env, napi_callback_info info) napi_value businessError = BusinessError::CreateCommonError( env, ERROR_INVALID_APPID, GET_DISPOSED_STATUS_SYNC); napi_throw(env, businessError); + APP_LOGE("appId empty"); return nullptr; } auto appControlProxy = GetAppControlProxy(); if (appControlProxy == nullptr) { - APP_LOGE("AppControlProxy is null"); + APP_LOGE("null appControlProxy"); napi_value error = BusinessError::CreateCommonError(env, ERROR_SYSTEM_ABILITY_NOT_FOUND, GET_DISPOSED_STATUS_SYNC); napi_throw(env, error); @@ -490,7 +491,7 @@ napi_value GetDisposedStatusSync(napi_env env, napi_callback_info info) ErrCode ret = appControlProxy->GetDisposedStatus(appId, disposedWant); ret = CommonFunc::ConvertErrCode(ret); if (ret != ERR_OK) { - APP_LOGE("GetDisposedStatusSync failed"); + APP_LOGE("sync get disposed status failed"); napi_value businessError = BusinessError::CreateCommonError( env, ret, GET_DISPOSED_STATUS_SYNC, PERMISSION_DISPOSED_STATUS); napi_throw(env, businessError); @@ -499,7 +500,7 @@ napi_value GetDisposedStatusSync(napi_env env, napi_callback_info info) napi_value nWant = nullptr; NAPI_CALL(env, napi_create_object(env, &nWant)); CommonFunc::ConvertWantInfo(env, nWant, disposedWant); - APP_LOGD("call GetDisposedStatusSync done"); + APP_LOGD("end"); return nWant; } @@ -656,7 +657,7 @@ static napi_value InnerGetDisposedRule(napi_env env, std::string &appId, int32_t napi_value GetDisposedRule(napi_env env, napi_callback_info info) { - APP_LOGD("NAPI GetDisposedRule called"); + APP_LOGD("begin"); NapiArg args(env, info); if (!args.Init(ARGS_SIZE_ONE, ARGS_SIZE_TWO)) { APP_LOGE("param count invalid"); @@ -715,6 +716,7 @@ static napi_value InnerSetDisposedRule(napi_env env, std::string &appId, Dispose napi_value SetDisposedRule(napi_env env, napi_callback_info info) { + APP_LOGD("begin"); NapiArg args(env, info); napi_value nRet; napi_get_undefined(env, &nRet); @@ -725,7 +727,7 @@ napi_value SetDisposedRule(napi_env env, napi_callback_info info) } std::string appId; if (!CommonFunc::ParseString(env, args[ARGS_POS_ZERO], appId)) { - APP_LOGE("appId %{public}s invalid!", appId.c_str()); + APP_LOGE("appId %{public}s invalid", appId.c_str()); BusinessError::ThrowParameterTypeError(env, ERROR_PARAM_CHECK_ERROR, APP_ID, TYPE_STRING); return nRet; } @@ -733,6 +735,7 @@ napi_value SetDisposedRule(napi_env env, napi_callback_info info) napi_value businessError = BusinessError::CreateCommonError( env, ERROR_INVALID_APPID, SET_DISPOSED_STATUS_SYNC); napi_throw(env, businessError); + APP_LOGE("appId empty"); return nullptr; } DisposedRule rule; diff --git a/interfaces/kits/js/default_app/js_default_app.cpp b/interfaces/kits/js/default_app/js_default_app.cpp index 6a8a6249a2..e179b96124 100644 --- a/interfaces/kits/js/default_app/js_default_app.cpp +++ b/interfaces/kits/js/default_app/js_default_app.cpp @@ -275,11 +275,11 @@ void IsDefaultApplicationComplete(napi_env env, napi_status status, void *data) napi_value IsDefaultApplication(napi_env env, napi_callback_info info) { - APP_LOGD("begin of IsDefaultApplication"); + APP_LOGD("begin"); NapiArg args(env, info); DefaultAppCallbackInfo *asyncCallbackInfo = new (std::nothrow) DefaultAppCallbackInfo(env); if (asyncCallbackInfo == nullptr) { - APP_LOGE("asyncCallbackInfo is null"); + APP_LOGE("null asyncCallbackInfo"); return nullptr; } std::unique_ptr callbackPtr {asyncCallbackInfo}; @@ -312,7 +312,7 @@ napi_value IsDefaultApplication(napi_env env, napi_callback_info info) auto promise = CommonFunc::AsyncCallNativeMethod( env, asyncCallbackInfo, IS_DEFAULT_APPLICATION, IsDefaultApplicationExec, IsDefaultApplicationComplete); callbackPtr.release(); - APP_LOGD("call IsDefaultApplication done"); + APP_LOGD("end"); return promise; } @@ -344,17 +344,19 @@ ErrCode ParamsProcessIsDefaultApplicationSync(napi_env env, napi_callback_info i napi_value IsDefaultApplicationSync(napi_env env, napi_callback_info info) { - APP_LOGD("begin to IsDefaultApplicationSync"); + APP_LOGD("begin"); napi_value nRet; bool isDefaultApp = false; napi_get_boolean(env, isDefaultApp, &nRet); std::string type; if (ParamsProcessIsDefaultApplicationSync(env, info, type) != ERR_OK) { + APP_LOGE("params process isDefault application sync failed"); return nRet; } auto defaultAppProxy = GetDefaultAppProxy(); if (defaultAppProxy == nullptr) { + APP_LOGE("null defaultAppProxy"); napi_value error = BusinessError::CreateCommonError(env, ERROR_BUNDLE_SERVICE_EXCEPTION, IS_DEFAULT_APPLICATION_SYNC); napi_throw(env, error); @@ -371,7 +373,7 @@ napi_value IsDefaultApplicationSync(napi_env env, napi_callback_info info) return nRet; } NAPI_CALL(env, napi_get_boolean(env, isDefaultApp, &nRet)); - APP_LOGD("call ResetDefaultApplicationSync done"); + APP_LOGD("end"); return nRet; } diff --git a/interfaces/kits/js/overlay/js_app_overlay.cpp b/interfaces/kits/js/overlay/js_app_overlay.cpp index e6937da011..567589487d 100644 --- a/interfaces/kits/js/overlay/js_app_overlay.cpp +++ b/interfaces/kits/js/overlay/js_app_overlay.cpp @@ -161,11 +161,11 @@ napi_value SetOverlayEnabled(napi_env env, napi_callback_info info) napi_value SetOverlayEnabledByBundleName(napi_env env, napi_callback_info info) { - APP_LOGD("NAPI SetOverlayEnabledByBundleName called"); + APP_LOGD("begin"); NapiArg args(env, info); OverlayCallbackInfo *overlayCallbackInfo = new (std::nothrow) OverlayCallbackInfo(env); if (overlayCallbackInfo == nullptr) { - APP_LOGE("overlayCallbackInfo is null"); + APP_LOGE("null overlayCallbackInfo"); return nullptr; } std::unique_ptr callbackPtr {overlayCallbackInfo}; @@ -201,10 +201,10 @@ napi_value SetOverlayEnabledByBundleName(napi_env env, napi_callback_info info) if (valueType == napi_function) { NAPI_CALL(env, napi_create_reference(env, args[i], NAPI_RETURN_ONE, &overlayCallbackInfo->callback)); } else { - APP_LOGD("SetOverlayEnabledByBundleName extra arg ignored"); + APP_LOGD("extra arg ignored"); } } else { - APP_LOGE("SetOverlayEnabledByBundleName arg err"); + APP_LOGE("arg err"); BusinessError::ThrowError(env, ERROR_PARAM_CHECK_ERROR, PARAM_TYPE_CHECK_ERROR); return nullptr; } @@ -215,7 +215,7 @@ napi_value SetOverlayEnabledByBundleName(napi_env env, napi_callback_info info) env, overlayCallbackInfo, SET_OVERLAY_ENABLED_BY_BUNDLE_NAME, SetOverlayEnabledExec, SetOverlayEnabledComplete); callbackPtr.release(); - APP_LOGD("call SetOverlayEnabledByBundleName done"); + APP_LOGD("end"); return promise; } @@ -293,11 +293,11 @@ void GetOverlayModuleInfoComplete(napi_env env, napi_status status, void *data) napi_value GetOverlayModuleInfo(napi_env env, napi_callback_info info) { - APP_LOGD("NAPI GetOverlayModuleInfo called"); + APP_LOGD("begin"); NapiArg args(env, info); OverlayCallbackInfo *overlayCallbackInfo = new (std::nothrow) OverlayCallbackInfo(env); if (overlayCallbackInfo == nullptr) { - APP_LOGE("overlayCallbackInfo is null"); + APP_LOGE("null overlayCallbackInfo"); return nullptr; } overlayCallbackInfo->option = OverlayOption::OPTION_GET_OVERLAY_MODULE_INFO; @@ -321,10 +321,10 @@ napi_value GetOverlayModuleInfo(napi_env env, napi_callback_info info) if (valueType == napi_function) { NAPI_CALL(env, napi_create_reference(env, args[i], NAPI_RETURN_ONE, &overlayCallbackInfo->callback)); } else { - APP_LOGD("GetOverlayModuleInfo extra arg ignored"); + APP_LOGD("extra arg ignored"); } } else { - APP_LOGE("GetOverlayModuleInfo arg err"); + APP_LOGE("arg err"); BusinessError::ThrowError(env, ERROR_PARAM_CHECK_ERROR, PARAM_TYPE_CHECK_ERROR); return nullptr; } @@ -332,7 +332,7 @@ napi_value GetOverlayModuleInfo(napi_env env, napi_callback_info info) auto promise = CommonFunc::AsyncCallNativeMethod( env, overlayCallbackInfo, GET_OVERLAY_MODULE_INFO, GetOverlayModuleInfoExec, GetOverlayModuleInfoComplete); callbackPtr.release(); - APP_LOGD("call GetOverlayModuleInfo done"); + APP_LOGD("end"); return promise; } @@ -358,11 +358,11 @@ void GetTargetOverlayModuleInfosComplete(napi_env env, napi_status status, void napi_value GetTargetOverlayModuleInfos(napi_env env, napi_callback_info info) { - APP_LOGD("NAPI GetTargetOverlayModuleInfos called"); + APP_LOGD("begin"); NapiArg args(env, info); OverlayCallbackInfo *overlayCallbackInfo = new (std::nothrow) OverlayCallbackInfo(env); if (overlayCallbackInfo == nullptr) { - APP_LOGE("overlayCallbackInfo is null"); + APP_LOGE("null overlayCallbackInfo"); return nullptr; } overlayCallbackInfo->option = OverlayOption::OPTION_GET_OVERLAY_TARGET_MODULE_INFO; @@ -386,10 +386,10 @@ napi_value GetTargetOverlayModuleInfos(napi_env env, napi_callback_info info) if (valueType == napi_function) { NAPI_CALL(env, napi_create_reference(env, args[i], NAPI_RETURN_ONE, &overlayCallbackInfo->callback)); } else { - APP_LOGD("GetTargetOverlayModuleInfos extra arg ignored"); + APP_LOGD("extra arg ignored"); } } else { - APP_LOGE("GetTargetOverlayModuleInfos arg err"); + APP_LOGE("arg err"); BusinessError::ThrowError(env, ERROR_PARAM_CHECK_ERROR, PARAM_TYPE_CHECK_ERROR); return nullptr; } @@ -398,7 +398,7 @@ napi_value GetTargetOverlayModuleInfos(napi_env env, napi_callback_info info) env, overlayCallbackInfo, GET_TARGET_OVERLAY_MODULE_INFOS, GetOverlayModuleInfoExec, GetTargetOverlayModuleInfosComplete); callbackPtr.release(); - APP_LOGD("call GetTargetOverlayModuleInfos done"); + APP_LOGD("end"); return promise; } diff --git a/services/bundlemgr/src/app_control/app_control_manager_host_impl.cpp b/services/bundlemgr/src/app_control/app_control_manager_host_impl.cpp index 8d7239ad21..eb6578438d 100644 --- a/services/bundlemgr/src/app_control/app_control_manager_host_impl.cpp +++ b/services/bundlemgr/src/app_control/app_control_manager_host_impl.cpp @@ -339,7 +339,7 @@ int32_t AppControlManagerHostImpl::GetCallingUserId() ErrCode AppControlManagerHostImpl::SetDisposedStatus(const std::string &appId, const Want &want, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "host begin to SetDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); if (!BundlePermissionMgr::IsSystemApp()) { LOG_E(BMS_TAG_DEFAULT, "non-system app calling system api"); return ERR_BUNDLE_MANAGER_SYSTEM_API_DENIED; @@ -352,19 +352,20 @@ ErrCode AppControlManagerHostImpl::SetDisposedStatus(const std::string &appId, c userId = GetCallingUserId(); } if (!appControlManager_) { - LOG_E(BMS_TAG_DEFAULT, "appControlManager_ is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null appControlManager_"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } ErrCode ret = appControlManager_->SetDisposedStatus(appId, want, userId); if (ret != ERR_OK) { LOG_W(BMS_TAG_DEFAULT, "host SetDisposedStatus error:%{public}d", ret); } + LOG_D(BMS_TAG_DEFAULT, "end"); return ret; } ErrCode AppControlManagerHostImpl::DeleteDisposedStatus(const std::string &appId, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "host begin to DeleteDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); if (!BundlePermissionMgr::IsSystemApp()) { LOG_E(BMS_TAG_DEFAULT, "non-system app calling system api"); return ERR_BUNDLE_MANAGER_SYSTEM_API_DENIED; @@ -377,7 +378,7 @@ ErrCode AppControlManagerHostImpl::DeleteDisposedStatus(const std::string &appId userId = GetCallingUserId(); } if (!appControlManager_) { - LOG_E(BMS_TAG_DEFAULT, "appControlManager_ is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null appControlManager_"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } ErrCode ret = appControlManager_->DeleteDisposedStatus(appId, userId); @@ -392,12 +393,13 @@ ErrCode AppControlManagerHostImpl::DeleteDisposedStatus(const std::string &appId } ret = appControlManager_->DeleteDisposedRule(callerName, appId, Constants::MAIN_APP_INDEX, userId); + LOG_D(BMS_TAG_DEFAULT, "end,ret:%{public}d", ret); return ret; } ErrCode AppControlManagerHostImpl::GetDisposedStatus(const std::string &appId, Want &want, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "host begin to GetDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); if (!BundlePermissionMgr::IsSystemApp()) { LOG_E(BMS_TAG_DEFAULT, "non-system app calling system api"); return ERR_BUNDLE_MANAGER_SYSTEM_API_DENIED; @@ -411,13 +413,14 @@ ErrCode AppControlManagerHostImpl::GetDisposedStatus(const std::string &appId, W userId = GetCallingUserId(); } if (!appControlManager_) { - LOG_E(BMS_TAG_DEFAULT, "appControlManager_ is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null appControlManager_"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } ErrCode ret = appControlManager_->GetDisposedStatus(appId, want, userId); if (ret != ERR_OK) { LOG_W(BMS_TAG_DEFAULT, "host GetDisposedStatus error:%{public}d", ret); } + LOG_D(BMS_TAG_DEFAULT, "end"); return ret; } @@ -485,7 +488,7 @@ void AppControlManagerHostImpl::GetCallerByUid(const int32_t uid, std::string &c ErrCode AppControlManagerHostImpl::GetDisposedRule(const std::string &appId, DisposedRule &rule, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "host begin to GetDisposedRule"); + LOG_D(BMS_TAG_DEFAULT, "begin"); if (!BundlePermissionMgr::IsSystemApp()) { LOG_E(BMS_TAG_DEFAULT, "non-system app calling system api"); return ERR_BUNDLE_MANAGER_SYSTEM_API_DENIED; @@ -503,19 +506,20 @@ ErrCode AppControlManagerHostImpl::GetDisposedRule(const std::string &appId, Dis userId = GetCallingUserId(); } if (!appControlManager_) { - LOG_E(BMS_TAG_DEFAULT, "appControlManager_ is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null appControlManager_"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } auto ret = appControlManager_->GetDisposedRule(callerName, appId, rule, Constants::MAIN_APP_INDEX, userId); if (ret != ERR_OK) { LOG_W(BMS_TAG_DEFAULT, "host GetDisposedStatus error:%{public}d", ret); } + LOG_D(BMS_TAG_DEFAULT, "end"); return ret; } ErrCode AppControlManagerHostImpl::SetDisposedRule(const std::string &appId, DisposedRule &rule, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "host begin to SetDisposedRule"); + LOG_D(BMS_TAG_DEFAULT, "begin"); if (!BundlePermissionMgr::IsSystemApp()) { LOG_E(BMS_TAG_DEFAULT, "non-system app calling system api"); return ERR_BUNDLE_MANAGER_SYSTEM_API_DENIED; @@ -535,13 +539,14 @@ ErrCode AppControlManagerHostImpl::SetDisposedRule(const std::string &appId, Dis userId = GetCallingUserId(); } if (!appControlManager_) { - LOG_E(BMS_TAG_DEFAULT, "appControlManager_ is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null appControlManager_"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } auto ret = appControlManager_->SetDisposedRule(callerName, appId, rule, Constants::MAIN_APP_INDEX, userId); if (ret != ERR_OK) { LOG_W(BMS_TAG_DEFAULT, "host GetDisposedStatus error:%{public}d", ret); } + LOG_D(BMS_TAG_DEFAULT, "end"); return ret; } @@ -564,7 +569,7 @@ ErrCode AppControlManagerHostImpl::GetAbilityRunningControlRule(const std::strin ErrCode AppControlManagerHostImpl::GetDisposedRuleForCloneApp(const std::string &appId, DisposedRule &rule, int32_t appIndex, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "host begin to GetDisposedRuleForCloneApp"); + LOG_D(BMS_TAG_DEFAULT, "begin"); if (!BundlePermissionMgr::IsSystemApp()) { LOG_E(BMS_TAG_DEFAULT, "non-system app calling system api"); return ERR_BUNDLE_MANAGER_SYSTEM_API_DENIED; @@ -585,20 +590,21 @@ ErrCode AppControlManagerHostImpl::GetDisposedRuleForCloneApp(const std::string userId = GetCallingUserId(); } if (!appControlManager_) { - LOG_E(BMS_TAG_DEFAULT, "appControlManager_ is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null appControlManager_"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } auto ret = appControlManager_->GetDisposedRule(callerName, appId, rule, appIndex, userId); if (ret != ERR_OK) { LOG_W(BMS_TAG_DEFAULT, "GetDisposedRuleForCloneApp error:%{public}d, appIndex:%{public}d", ret, appIndex); } + LOG_D(BMS_TAG_DEFAULT, "end"); return ret; } ErrCode AppControlManagerHostImpl::SetDisposedRuleForCloneApp(const std::string &appId, DisposedRule &rule, int32_t appIndex, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "host begin to SetDisposedRuleForCloneApp"); + LOG_D(BMS_TAG_DEFAULT, "begin"); if (!BundlePermissionMgr::IsSystemApp()) { LOG_E(BMS_TAG_DEFAULT, "non-system app calling system api"); return ERR_BUNDLE_MANAGER_SYSTEM_API_DENIED; @@ -621,19 +627,20 @@ ErrCode AppControlManagerHostImpl::SetDisposedRuleForCloneApp(const std::string userId = GetCallingUserId(); } if (!appControlManager_) { - LOG_E(BMS_TAG_DEFAULT, "appControlManager_ is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null appControlManager_"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } auto ret = appControlManager_->SetDisposedRule(callerName, appId, rule, appIndex, userId); if (ret != ERR_OK) { LOG_W(BMS_TAG_DEFAULT, "SetDisposedRuleForCloneApp error:%{public}d, appIndex:%{public}d", ret, appIndex); } + LOG_D(BMS_TAG_DEFAULT, "end"); return ret; } ErrCode AppControlManagerHostImpl::DeleteDisposedRuleForCloneApp(const std::string &appId, int32_t appIndex, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "host begin to DeleteDisposedRuleForCloneApp"); + LOG_D(BMS_TAG_DEFAULT, "begin"); if (!BundlePermissionMgr::IsSystemApp()) { LOG_E(BMS_TAG_DEFAULT, "non-system app calling system api"); return ERR_BUNDLE_MANAGER_SYSTEM_API_DENIED; @@ -650,7 +657,7 @@ ErrCode AppControlManagerHostImpl::DeleteDisposedRuleForCloneApp(const std::stri userId = GetCallingUserId(); } if (!appControlManager_) { - LOG_E(BMS_TAG_DEFAULT, "appControlManager_ is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null appControlManager_"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } ErrCode ret = ERR_OK; @@ -670,6 +677,7 @@ ErrCode AppControlManagerHostImpl::DeleteDisposedRuleForCloneApp(const std::stri if (ret != ERR_OK) { LOG_W(BMS_TAG_DEFAULT, "DeleteDisposedRule error:%{public}d, appIndex:%{public}d", ret, appIndex); } + LOG_D(BMS_TAG_DEFAULT, "end"); return ret; } diff --git a/services/bundlemgr/src/app_control/app_control_manager_rdb.cpp b/services/bundlemgr/src/app_control/app_control_manager_rdb.cpp index ed7be1df64..b8e118af1a 100644 --- a/services/bundlemgr/src/app_control/app_control_manager_rdb.cpp +++ b/services/bundlemgr/src/app_control/app_control_manager_rdb.cpp @@ -398,7 +398,7 @@ ErrCode AppControlManagerRdb::GetAppRunningControlRule(const std::string &appId, ErrCode AppControlManagerRdb::SetDisposedStatus(const std::string &callingName, const std::string &appId, const Want &want, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "rdb begin to SetDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); ErrCode code = DeleteDisposedStatus(callingName, appId, userId); if (code != ERR_OK) { LOG_E(BMS_TAG_DEFAULT, "DeleteDisposedStatus failed"); @@ -427,13 +427,14 @@ ErrCode AppControlManagerRdb::SetDisposedStatus(const std::string &callingName, info.operationType = static_cast(OPERATION_TYPE_ENUM::OPERATION_TYPE_ADD_RULE); info.actionType = static_cast(ACTION_TYPE_ENUM::ACTION_TYPE_DISPOSE_STATUS); EventReport::SendAppControlRuleEvent(info); + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlManagerRdb::DeleteDisposedStatus(const std::string &callingName, const std::string &appId, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "rdb begin to DeleteDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); NativeRdb::AbsRdbPredicates absRdbPredicates(APP_CONTROL_RDB_TABLE_NAME); absRdbPredicates.EqualTo(CALLING_NAME, callingName); absRdbPredicates.EqualTo(APP_CONTROL_LIST, RUNNING_CONTROL); @@ -441,7 +442,7 @@ ErrCode AppControlManagerRdb::DeleteDisposedStatus(const std::string &callingNam absRdbPredicates.EqualTo(USER_ID, std::to_string(userId)); bool ret = rdbDataManager_->DeleteData(absRdbPredicates); if (!ret) { - LOG_E(BMS_TAG_DEFAULT, "DeleteDisposedStatus callingName:%{public}s appId:%{private}s failed", + LOG_E(BMS_TAG_DEFAULT, "delete data failed,callingName:%{public}s,appId:%{private}s", callingName.c_str(), appId.c_str()); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } @@ -452,13 +453,14 @@ ErrCode AppControlManagerRdb::DeleteDisposedStatus(const std::string &callingNam info.operationType = static_cast(OPERATION_TYPE_ENUM::OPERATION_TYPE_REMOVE_RULE); info.actionType = static_cast(ACTION_TYPE_ENUM::ACTION_TYPE_DISPOSE_STATUS); EventReport::SendAppControlRuleEvent(info); + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlManagerRdb::GetDisposedStatus(const std::string &callingName, const std::string &appId, Want &want, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "rdb begin to GetDisposedStatus"); + LOG_D(BMS_TAG_DEFAULT, "begin"); NativeRdb::AbsRdbPredicates absRdbPredicates(APP_CONTROL_RDB_TABLE_NAME); absRdbPredicates.EqualTo(CALLING_NAME, callingName); absRdbPredicates.EqualTo(APP_CONTROL_LIST, RUNNING_CONTROL); @@ -492,6 +494,7 @@ ErrCode AppControlManagerRdb::GetDisposedStatus(const std::string &callingName, return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } want = *Want::FromString(wantString); + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } @@ -522,9 +525,10 @@ ErrCode AppControlManagerRdb::DeleteOldControlRule(const std::string &callingNam ErrCode AppControlManagerRdb::SetDisposedRule(const std::string &callingName, const std::string &appId, const DisposedRule &rule, int32_t appIndex, int32_t userId) { + LOG_D(BMS_TAG_DEFAULT, "begin"); ErrCode code = DeleteDisposedRule(callingName, appId, appIndex, userId); if (code != ERR_OK) { - LOG_E(BMS_TAG_DEFAULT, "DeleteDisposedStatus failed."); + LOG_E(BMS_TAG_DEFAULT, "DeleteDisposedStatus failed"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } int64_t timeStamp = BundleUtil::GetCurrentTime(); @@ -539,7 +543,7 @@ ErrCode AppControlManagerRdb::SetDisposedRule(const std::string &callingName, valuesBucket.PutString(APP_INDEX, std::to_string(appIndex)); bool ret = rdbDataManager_->InsertData(valuesBucket); if (!ret) { - LOG_E(BMS_TAG_DEFAULT, "SetDisposedStatus callingName:%{public}s appId:%{private}s failed.", + LOG_E(BMS_TAG_DEFAULT, "insert data failed,callingName:%{public}s,appId:%{private}s", callingName.c_str(), appId.c_str()); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } @@ -552,12 +556,14 @@ ErrCode AppControlManagerRdb::SetDisposedRule(const std::string &callingName, info.actionType = static_cast(ACTION_TYPE_ENUM::ACTION_TYPE_DISPOSE_RULE); info.appIndex = appIndex; EventReport::SendAppControlRuleEvent(info); + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } ErrCode AppControlManagerRdb::DeleteDisposedRule(const std::string &callingName, const std::string &appId, int32_t appIndex, int32_t userId) { + LOG_D(BMS_TAG_DEFAULT, "begin"); NativeRdb::AbsRdbPredicates absRdbPredicates(APP_CONTROL_RDB_TABLE_NAME); absRdbPredicates.EqualTo(CALLING_NAME, callingName); absRdbPredicates.EqualTo(APP_CONTROL_LIST, DISPOSED_RULE); @@ -566,7 +572,7 @@ ErrCode AppControlManagerRdb::DeleteDisposedRule(const std::string &callingName, absRdbPredicates.EqualTo(APP_INDEX, std::to_string(appIndex)); bool ret = rdbDataManager_->DeleteData(absRdbPredicates); if (!ret) { - LOG_E(BMS_TAG_DEFAULT, "DeleteDisposedStatus callingName:%{public}s appId:%{private}s failed", + LOG_E(BMS_TAG_DEFAULT, "delete data failed,callingName:%{public}s,appId:%{private}s", callingName.c_str(), appId.c_str()); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } @@ -578,6 +584,7 @@ ErrCode AppControlManagerRdb::DeleteDisposedRule(const std::string &callingName, info.actionType = static_cast(ACTION_TYPE_ENUM::ACTION_TYPE_DISPOSE_RULE); info.appIndex = appIndex; EventReport::SendAppControlRuleEvent(info); + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } @@ -617,7 +624,7 @@ ErrCode AppControlManagerRdb::OptimizeDisposedPredicates(const std::string &call ErrCode AppControlManagerRdb::GetDisposedRule(const std::string &callingName, const std::string &appId, DisposedRule &rule, int32_t appIndex, int32_t userId) { - LOG_D(BMS_TAG_DEFAULT, "rdb begin to GetDisposedRule"); + LOG_D(BMS_TAG_DEFAULT, "begin"); NativeRdb::AbsRdbPredicates absRdbPredicates(APP_CONTROL_RDB_TABLE_NAME); absRdbPredicates.EqualTo(CALLING_NAME, callingName); absRdbPredicates.EqualTo(APP_CONTROL_LIST, DISPOSED_RULE); @@ -627,7 +634,7 @@ ErrCode AppControlManagerRdb::GetDisposedRule(const std::string &callingName, OptimizeDisposedPredicates(callingName, appId, userId, appIndex, absRdbPredicates); auto absSharedResultSet = rdbDataManager_->QueryData(absRdbPredicates); if (absSharedResultSet == nullptr) { - LOG_E(BMS_TAG_DEFAULT, "GetAppInstallControlRule failed"); + LOG_E(BMS_TAG_DEFAULT, "query data failed"); return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } ScopeGuard stateGuard([&] { absSharedResultSet->Close(); }); @@ -653,6 +660,7 @@ ErrCode AppControlManagerRdb::GetDisposedRule(const std::string &callingName, return ERR_BUNDLE_MANAGER_APP_CONTROL_INTERNAL_ERROR; } DisposedRule::FromString(ruleString, rule); + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } diff --git a/services/bundlemgr/src/bundle_data_mgr.cpp b/services/bundlemgr/src/bundle_data_mgr.cpp index 1bea102690..d026feb305 100644 --- a/services/bundlemgr/src/bundle_data_mgr.cpp +++ b/services/bundlemgr/src/bundle_data_mgr.cpp @@ -6721,10 +6721,11 @@ bool BundleDataMgr::UpdateInnerBundleInfo(const InnerBundleInfo &innerBundleInfo bool BundleDataMgr::QueryOverlayInnerBundleInfo(const std::string &bundleName, InnerBundleInfo &info) { - APP_LOGD("start to query overlay innerBundleInfo"); + APP_LOGD("begin"); std::shared_lock lock(bundleInfoMutex_); if (bundleInfos_.find(bundleName) != bundleInfos_.end()) { info = bundleInfos_.at(bundleName); + APP_LOGD("end"); return true; } diff --git a/services/bundlemgr/src/bundle_permission_mgr.cpp b/services/bundlemgr/src/bundle_permission_mgr.cpp index b02526defa..e7257f9bb8 100644 --- a/services/bundlemgr/src/bundle_permission_mgr.cpp +++ b/services/bundlemgr/src/bundle_permission_mgr.cpp @@ -296,6 +296,7 @@ bool BundlePermissionMgr::VerifyCallingPermissionForAll(const std::string &permi bool BundlePermissionMgr::VerifyCallingPermissionsForAll(const std::vector &permissionNames) { + LOG_D(BMS_TAG_DEFAULT, "begin"); AccessToken::AccessTokenID callerToken = IPCSkeleton::GetCallingTokenID(); for (auto permissionName : permissionNames) { if (AccessToken::AccessTokenKit::VerifyAccessToken(callerToken, permissionName) == @@ -308,7 +309,7 @@ bool BundlePermissionMgr::VerifyCallingPermissionsForAll(const std::vector::GetInstance()->GetDataMgr(); if (dataMgr == nullptr) { - LOG_E(BMS_TAG_DEFAULT, "DataMgr is nullptr"); + LOG_E(BMS_TAG_DEFAULT, "null dataMgr"); return false; } int32_t callingUid = IPCSkeleton::GetCallingUid(); diff --git a/services/bundlemgr/src/default_app/default_app_mgr.cpp b/services/bundlemgr/src/default_app/default_app_mgr.cpp index 88da3cad66..353fb20a7b 100644 --- a/services/bundlemgr/src/default_app/default_app_mgr.cpp +++ b/services/bundlemgr/src/default_app/default_app_mgr.cpp @@ -133,9 +133,11 @@ ErrCode DefaultAppMgr::IsDefaultApplication(int32_t userId, const std::string& t for (const std::string& normalizedType : normalizedTypeVector) { (void)IsDefaultApplicationInternal(userId, normalizedType, isDefaultApp); if (isDefaultApp) { + LOG_D(BMS_TAG_DEFAULT, "end with isDefaultApp"); return ERR_OK; } } + LOG_D(BMS_TAG_DEFAULT, "end"); return ERR_OK; } diff --git a/services/bundlemgr/src/overlay/bundle_overlay_data_manager.cpp b/services/bundlemgr/src/overlay/bundle_overlay_data_manager.cpp index 8d60ca104e..97f8f391ac 100644 --- a/services/bundlemgr/src/overlay/bundle_overlay_data_manager.cpp +++ b/services/bundlemgr/src/overlay/bundle_overlay_data_manager.cpp @@ -457,6 +457,7 @@ ErrCode OverlayDataMgr::GetOverlayModuleInfo(const std::string &bundleName, cons { APP_LOGD("start"); if (GetBundleDataMgr() != ERR_OK) { + APP_LOGE("get bundle dataMgr failed"); return ERR_BUNDLEMANAGER_OVERLAY_INSTALLATION_FAILED_INTERNAL_ERROR; } InnerBundleInfo info; @@ -488,6 +489,7 @@ ErrCode OverlayDataMgr::GetOverlayModuleInfo(const std::string &bundleName, cons auto innerModuleInfo = info.GetInnerModuleInfoByModuleName(moduleName); if (innerModuleInfo == std::nullopt) { + APP_LOGE("get innerMoudleInfo by moduleName failed"); return ERR_BUNDLEMANAGER_OVERLAY_INSTALLATION_FAILED_INTERNAL_ERROR; } @@ -501,6 +503,7 @@ ErrCode OverlayDataMgr::GetOverlayModuleInfo(const std::string &bundleName, cons APP_LOGW("GetOverlayModuleState failed of bundleName %{public}s and moduleName %{public}s", bundleName.c_str(), moduleName.c_str()); } + APP_LOGD("end"); return ERR_OK; } @@ -534,6 +537,7 @@ ErrCode OverlayDataMgr::GetOverlayModuleInfoForTarget(const std::string &targetB { APP_LOGD("start"); if (GetBundleDataMgr() != ERR_OK) { + APP_LOGE("get bundle dataMgr failed"); return ERR_BUNDLEMANAGER_OVERLAY_INSTALLATION_FAILED_INTERNAL_ERROR; } InnerBundleInfo targetInnerBundleInfo; @@ -557,8 +561,8 @@ ErrCode OverlayDataMgr::GetOverlayModuleInfoForTarget(const std::string &targetB } if (!targetInnerBundleInfo.FindModule(targetModuleName)) { - APP_LOGD("the target module %{public}s is not existed in bundle %{public}s", targetModuleName.c_str(), - targetBundleName.c_str()); + APP_LOGE("the target module %{public}s is not existed in bundle %{public}s", + targetModuleName.c_str(), targetBundleName.c_str()); return ERR_BUNDLEMANAGER_OVERLAY_QUERY_FAILED_TARGET_MODULE_NOT_EXISTED; } if (targetInnerBundleInfo.isOverlayModule(targetModuleName)) { @@ -567,6 +571,7 @@ ErrCode OverlayDataMgr::GetOverlayModuleInfoForTarget(const std::string &targetB } auto targetModuleInfo = targetInnerBundleInfo.GetInnerModuleInfoByModuleName(targetModuleName); if (targetModuleInfo == std::nullopt) { + APP_LOGE("get inner module info by module name failed"); return ERR_BUNDLEMANAGER_OVERLAY_INSTALLATION_FAILED_INTERNAL_ERROR; } const auto &moduleInfo = targetModuleInfo.value(); @@ -583,6 +588,7 @@ ErrCode OverlayDataMgr::GetOverlayModuleInfoForTarget(const std::string &targetB return res; } } + APP_LOGD("end"); return ERR_OK; } @@ -658,6 +664,7 @@ ErrCode OverlayDataMgr::SetOverlayEnabled(const std::string &bundleName, const s int32_t userId) { if (GetBundleDataMgr() != ERR_OK) { + APP_LOGE("get bundle dataMgr failed"); return ERR_BUNDLEMANAGER_OVERLAY_INSTALLATION_FAILED_INTERNAL_ERROR; } InnerBundleInfo innerBundleInfo; diff --git a/services/bundlemgr/src/rdb/rdb_data_manager.cpp b/services/bundlemgr/src/rdb/rdb_data_manager.cpp index 505c303642..3232b0731d 100644 --- a/services/bundlemgr/src/rdb/rdb_data_manager.cpp +++ b/services/bundlemgr/src/rdb/rdb_data_manager.cpp @@ -150,10 +150,10 @@ void RdbDataManager::BackupRdb() bool RdbDataManager::InsertData(const std::string &key, const std::string &value) { - APP_LOGD("InsertData start"); + APP_LOGD("begin"); auto rdbStore = GetRdbStore(); if (rdbStore == nullptr) { - APP_LOGE("RdbStore is null"); + APP_LOGE("null rdbStore"); return false; } @@ -162,20 +162,22 @@ bool RdbDataManager::InsertData(const std::string &key, const std::string &value valuesBucket.PutString(BMS_KEY, key); valuesBucket.PutString(BMS_VALUE, value); auto ret = InsertWithRetry(rdbStore, rowId, valuesBucket); + APP_LOGD("end,ret:%{public}d", ret); return ret == NativeRdb::E_OK; } bool RdbDataManager::InsertData(const NativeRdb::ValuesBucket &valuesBucket) { - APP_LOGD("InsertData start"); + APP_LOGD("begin"); auto rdbStore = GetRdbStore(); if (rdbStore == nullptr) { - APP_LOGE("RdbStore is null"); + APP_LOGE("null rdbStore"); return false; } int64_t rowId = -1; auto ret = InsertWithRetry(rdbStore, rowId, valuesBucket); + APP_LOGD("end,ret:%{public}d", ret); return ret == NativeRdb::E_OK; } @@ -270,9 +272,10 @@ bool RdbDataManager::DeleteData(const std::string &key) bool RdbDataManager::DeleteData(const NativeRdb::AbsRdbPredicates &absRdbPredicates) { + APP_LOGD("begin"); auto rdbStore = GetRdbStore(); if (rdbStore == nullptr) { - APP_LOGE("RdbStore is null"); + APP_LOGE("null rdbStore"); return false; } if (absRdbPredicates.GetTableName() != bmsRdbConfig_.tableName) { @@ -281,6 +284,7 @@ bool RdbDataManager::DeleteData(const NativeRdb::AbsRdbPredicates &absRdbPredica } int32_t rowId = -1; auto ret = rdbStore->Delete(rowId, absRdbPredicates); + APP_LOGD("end,ret:%{public}d", ret); return ret == NativeRdb::E_OK; } @@ -319,10 +323,10 @@ bool RdbDataManager::QueryData(const std::string &key, std::string &value) std::shared_ptr RdbDataManager::QueryData( const NativeRdb::AbsRdbPredicates &absRdbPredicates) { - APP_LOGD("QueryData start"); + APP_LOGD("begin"); auto rdbStore = GetRdbStore(); if (rdbStore == nullptr) { - APP_LOGE("RdbStore is null"); + APP_LOGE("null rdbStore"); return nullptr; } if (absRdbPredicates.GetTableName() != bmsRdbConfig_.tableName) { @@ -334,6 +338,7 @@ std::shared_ptr RdbDataManager::QueryData( APP_LOGE("absSharedResultSet failed"); return nullptr; } + APP_LOGD("end"); return absSharedResultSet; } -- Gitee