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

log

Browse Source 
Signed-off-by: chenxinzhan <chenxinzhan@huawei.com>
This commit is contained in:
chenxinzhan
2024-08-08 14:56:11 +08:00
parent b0e30a5798
commit e522a20c0f
16 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/appkit/app/main_thread.cpp
+1 -1
View File
@@ -3433,7 +3433,7 @@ void MainThread::ParseAppConfigurationParams(const std::string configuration, Co
TAG_LOGD(AAFwkTag::APPKIT, "start");
appConfig.AddItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE, DEFAULT_APP_FONT_SIZE_SCALE);
if (configuration.empty()) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "empty configuration");
TAG_LOGE(AAFwkTag::ABILITYMGR, "empty config");
return;
}
nlohmann::json configurationJson = nlohmann::json::parse(configuration, nullptr, false);
services/abilitymgr/src/ability_connect_manager.cpp
+4 -4
View File
@@ -785,7 +785,7 @@ int AbilityConnectManager::DisconnectRecordNormal(ConnectListType &list,
{
auto result = connectRecord->DisconnectAbility();
if (result != ERR_OK) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Disconnect ability fail , ret = %{public}d.", result);
TAG_LOGE(AAFwkTag::ABILITYMGR, "fail:%{public}d.", result);
return result;
}
@@ -1959,7 +1959,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr<IRemoteObject> connect
std::lock_guard guard(recipientMapMutex_);
auto it = recipientMap_.find(connectObject);
if (it != recipientMap_.end()) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "This death recipient has been added.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "recipient added before");
return;
}
}
@@ -1973,7 +1973,7 @@ void AbilityConnectManager::AddConnectDeathRecipient(sptr<IRemoteObject> connect
}
});
if (!connectObject->AddDeathRecipient(deathRecipient)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "AddDeathRecipient failed");
TAG_LOGE(AAFwkTag::ABILITYMGR, "failed");
return;
}
std::lock_guard guard(recipientMapMutex_);
@@ -2830,7 +2830,7 @@ void AbilityConnectManager::AddUIExtWindowDeathRecipient(const sptr<IRemoteObjec
std::lock_guard lock(uiExtRecipientMapMutex_);
auto it = uiExtRecipientMap_.find(session);
if (it != uiExtRecipientMap_.end()) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "This death recipient has been added.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "recipient added before");
return;
} else {
std::weak_ptr<AbilityConnectManager> thisWeakPtr(shared_from_this());
services/abilitymgr/src/ability_manager_client.cpp
+1 -1
View File
@@ -493,7 +493,7 @@ ErrCode AbilityManagerClient::ConnectAbility(
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
auto abms = GetAbilityManager();
CHECK_POINTER_RETURN_NOT_CONNECTED(abms);
TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, userId:%{public}d.",
TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s %{public}s, userId:%{public}d",
want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), userId);
return abms->ConnectAbilityCommon(want, connect, callerToken, AppExecFwk::ExtensionAbilityType::SERVICE, userId);
}
services/abilitymgr/src/ability_manager_service.cpp
+14 -14
View File
@@ -753,7 +753,7 @@ int AbilityManagerService::StartAbilityPublicPrechainCheck(StartAbilityParams &p
// 2. validUserId, multi-user
if (!JudgeMultiUserConcurrency(params.GetValidUserId())) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
return ERR_CROSS_USER;
}
@@ -1006,7 +1006,7 @@ int AbilityManagerService::StartAbilityInner(const Want &want, const sptr<IRemot
}
if (!JudgeMultiUserConcurrency(validUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
return ERR_CROSS_USER;
}
@@ -1317,7 +1317,7 @@ int AbilityManagerService::StartAbilityDetails(const Want &want, const AbilitySt
}
if (!JudgeMultiUserConcurrency(validUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
eventInfo.errCode = ERR_INVALID_VALUE;
SendAbilityEvent(EventName::START_ABILITY_ERROR, HiSysEventType::FAULT, eventInfo);
return ERR_CROSS_USER;
@@ -1605,7 +1605,7 @@ int AbilityManagerService::StartAbilityForOptionInner(const Want &want, const St
callerToken, true, specifyTokenId);
}
if (!JudgeMultiUserConcurrency(validUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
eventInfo.errCode = ERR_INVALID_VALUE;
SendAbilityEvent(EventName::START_ABILITY_ERROR, HiSysEventType::FAULT, eventInfo);
return ERR_CROSS_USER;
@@ -1874,7 +1874,7 @@ int32_t AbilityManagerService::RequestDialogServiceInner(const Want &want, const
}
if (!JudgeMultiUserConcurrency(validUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
return ERR_CROSS_USER;
}
AbilityRequest abilityRequest;
@@ -2695,7 +2695,7 @@ int AbilityManagerService::StartExtensionAbilityInner(const Want &want, const sp
}
if (!JudgeMultiUserConcurrency(validUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
eventInfo.errCode = ERR_INVALID_VALUE;
EventReport::SendExtensionEvent(EventName::START_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo);
return ERR_CROSS_USER;
@@ -2835,7 +2835,7 @@ void AbilityManagerService::SetAutoFillElementName(const sptr<SessionInfo> &exte
} else if (extensionSessionInfo->want.GetStringParam(UIEXTENSION_TYPE_KEY) == AUTO_FILL_SMART_TPYE) {
SplitStr(KEY_SMART_AUTO_FILL_ABILITY, "/", argList);
} else {
TAG_LOGW(AAFwkTag::ABILITYMGR, "It is not autofill type.");
TAG_LOGW(AAFwkTag::ABILITYMGR, "not autofill");
return;
}
@@ -2963,7 +2963,7 @@ int AbilityManagerService::StartUIExtensionAbility(const sptr<SessionInfo> &exte
int32_t validUserId = GetValidUserId(userId);
if (!JudgeMultiUserConcurrency(validUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
eventInfo.errCode = ERR_INVALID_VALUE;
EventReport::SendExtensionEvent(EventName::START_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo);
return ERR_INVALID_VALUE;
@@ -3053,7 +3053,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptr<IRe
int32_t userId, AppExecFwk::ExtensionAbilityType extensionType)
{
TAG_LOGI(AAFwkTag::ABILITYMGR,
"Stop extension ability come, bundlename: %{public}s, ability is %{public}s, userId is %{public}d",
"bundlename:%{public}s, ability:%{public}s, userId:%{public}d",
want.GetElement().GetBundleName().c_str(), want.GetElement().GetAbilityName().c_str(), userId);
if (extensionType != AppExecFwk::ExtensionAbilityType::VPN) {
CHECK_CALLER_IS_SYSTEM_APP;
@@ -3083,7 +3083,7 @@ int AbilityManagerService::StopExtensionAbility(const Want &want, const sptr<IRe
int32_t validUserId = GetValidUserId(userId);
if (!JudgeMultiUserConcurrency(validUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
eventInfo.errCode = ERR_INVALID_VALUE;
EventReport::SendExtensionEvent(EventName::STOP_EXTENSION_ERROR, HiSysEventType::FAULT, eventInfo);
return ERR_CROSS_USER;
@@ -3921,7 +3921,7 @@ int AbilityManagerService::ConnectLocalAbility(const Want &want, const int32_t u
AbilityUtil::RemoveShowModeKey(const_cast<Want &>(want));
bool isEnterpriseAdmin = AAFwk::UIExtensionUtils::IsEnterpriseAdmin(extensionType);
if (!isEnterpriseAdmin && !JudgeMultiUserConcurrency(userId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
return ERR_CROSS_USER;
}
@@ -3942,7 +3942,7 @@ int AbilityManagerService::ConnectLocalAbility(const Want &want, const int32_t u
TAG_LOGD(AAFwkTag::ABILITYMGR, "requestWant SetParam success");
if (result != ERR_OK) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate ability request error.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Generate request error");
return result;
}
if (!UriUtils::GetInstance().CheckNonImplicitShareFileUri(abilityRequest)) {
@@ -6095,7 +6095,7 @@ int AbilityManagerService::StopServiceAbility(const Want &want, int32_t userId,
int32_t validUserId = GetValidUserId(userId);
if (!JudgeMultiUserConcurrency(validUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
return ERR_CROSS_USER;
}
@@ -7003,7 +7003,7 @@ int AbilityManagerService::StartAbilityByCall(const Want &want, const sptr<IAbil
}
int32_t oriValidUserId = GetValidUserId(accountId);
if (!JudgeMultiUserConcurrency(oriValidUserId)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent mode is not satisfied.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "Multi-user non-concurrent unsatisfied");
return ERR_CROSS_USER;
}
services/abilitymgr/src/ability_record.cpp
+2 -2
View File
@@ -370,7 +370,7 @@ void AbilityRecord::ForegroundAbility(uint32_t sceneFlag)
{
HITRACE_METER_NAME(HITRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__);
isWindowStarted_ = true;
TAG_LOGI(AAFwkTag::ABILITYMGR, "ForegroundLifecycle: name:%{public}s.", abilityInfo_.name.c_str());
TAG_LOGI(AAFwkTag::ABILITYMGR, "name:%{public}s", abilityInfo_.name.c_str());
CHECK_POINTER(lifecycleDeal_);
// schedule active after updating AbilityState and sending timeout message to avoid ability async callback
@@ -1843,7 +1843,7 @@ void AbilityRecord::SaveResultToCallers(const int resultCode, const Want *result
{
auto callerRecordList = GetCallerRecordList();
if (callerRecordList.empty()) {
TAG_LOGW(AAFwkTag::ABILITYMGR, "callerRecordList is empty.");
TAG_LOGW(AAFwkTag::ABILITYMGR, "callerList empty");
return;
}
auto latestCaller = callerRecordList.back();
services/abilitymgr/src/ability_scheduler_stub.cpp
+1 -1
View File
@@ -758,7 +758,7 @@ int AbilitySchedulerStub::BlockAbilityInner(MessageParcel &data, MessageParcel &
void AbilitySchedulerRecipient::OnRemoteDied(const wptr<IRemoteObject> &remote)
{
TAG_LOGE(AAFwkTag::ABILITYMGR, "recv AbilitySchedulerRecipient death notice");
TAG_LOGE(AAFwkTag::ABILITYMGR, "call");
if (handler_) {
handler_(remote);
services/abilitymgr/src/app_exit_reason_data_manager.cpp
+5 -5
View File
@@ -386,7 +386,7 @@ int32_t AppExitReasonDataManager::DeleteAllRecoverInfoByTokenId(uint32_t tokenId
int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo(
uint32_t accessTokenId, const std::string &moduleName, const std::string &abilityName)
{
TAG_LOGI(AAFwkTag::ABILITYMGR, "DeleteAbilityRecoverInfo tokenId %{private}u module %{public}s ability %{public}s ",
TAG_LOGI(AAFwkTag::ABILITYMGR, "tokenId %{private}u module %{public}s ability %{public}s ",
accessTokenId, moduleName.c_str(), abilityName.c_str());
{
std::lock_guard<std::mutex> lock(kvStorePtrMutex_);
@@ -400,7 +400,7 @@ int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo(
DistributedKv::Value value;
DistributedKv::Status status = kvStorePtr_->Get(key, value);
if (status != DistributedKv::Status::SUCCESS) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "DeleteAbilityRecoverInfo get error: %{public}d", status);
TAG_LOGE(AAFwkTag::ABILITYMGR, "failed:%{public}d", status);
return ERR_INVALID_VALUE;
}
@@ -429,7 +429,7 @@ int32_t AppExitReasonDataManager::DeleteAbilityRecoverInfo(
int32_t AppExitReasonDataManager::GetAbilityRecoverInfo(
uint32_t accessTokenId, const std::string &moduleName, const std::string &abilityName, bool &hasRecoverInfo)
{
TAG_LOGI(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo tokenId %{private}u module %{public}s abillity %{public}s ",
TAG_LOGI(AAFwkTag::ABILITYMGR, "tokenId %{private}u module %{public}s abillity %{public}s",
accessTokenId, moduleName.c_str(), abilityName.c_str());
hasRecoverInfo = false;
{
@@ -445,9 +445,9 @@ int32_t AppExitReasonDataManager::GetAbilityRecoverInfo(
DistributedKv::Status status = kvStorePtr_->Get(key, value);
if (status != DistributedKv::Status::SUCCESS) {
if (status == DistributedKv::Status::KEY_NOT_FOUND) {
TAG_LOGW(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo KEY_NOT_FOUND.");
TAG_LOGW(AAFwkTag::ABILITYMGR, "KEY_NOT_FOUND");
} else {
TAG_LOGE(AAFwkTag::ABILITYMGR, "GetAbilityRecoverInfo error: %{public}d.", status);
TAG_LOGE(AAFwkTag::ABILITYMGR, "error:%{public}d", status);
}
return ERR_INVALID_VALUE;
}
services/abilitymgr/src/app_exit_reason_helper.cpp
+2 -2
View File
@@ -68,7 +68,7 @@ int32_t AppExitReasonHelper::RecordAppExitReason(const ExitReason &exitReason)
}
if (abilityList.empty()) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Active abilityLists empty.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "abilityLists empty");
return ERR_GET_ACTIVE_ABILITY_LIST_EMPTY;
}
int32_t userId;
@@ -138,7 +138,7 @@ int32_t AppExitReasonHelper::RecordProcessExitReason(const int32_t pid, const st
auto ret = DelayedSingleton<AppScheduler>::GetInstance()->NotifyAppMgrRecordExitReason(pid, exitReason.reason,
exitReason.exitMsg);
if (ret != ERR_OK) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed.code: %{public}d", ret);
TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed:%{public}d", ret);
}
if (abilityLists.empty()) {
services/abilitymgr/src/app_scheduler.cpp
+2 -2
View File
@@ -479,13 +479,13 @@ int AppScheduler::GetApplicationInfoByProcessID(const int pid, AppExecFwk::Appli
int32_t AppScheduler::NotifyAppMgrRecordExitReason(int32_t pid, int32_t reason, const std::string &exitMsg)
{
if (pid < 0) {
TAG_LOGW(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed, pid <= 0.");
TAG_LOGW(AAFwkTag::ABILITYMGR, "pid<=0");
return ERR_INVALID_VALUE;
}
CHECK_POINTER_AND_RETURN(appMgrClient_, INNER_ERR);
auto ret = static_cast<int32_t>(IN_PROCESS_CALL(appMgrClient_->NotifyAppMgrRecordExitReason(pid, reason, exitMsg)));
if (ret != ERR_OK) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "NotifyAppMgrRecordExitReason failed.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "failed");
return ret;
}
return ERR_OK;
services/abilitymgr/src/call_container.cpp
+1 -1
View File
@@ -135,7 +135,7 @@ bool CallContainer::CallRequestDone(const sptr<IRemoteObject> &callStub)
}
});
TAG_LOGI(AAFwkTag::ABILITYMGR, "Call Request Done end.");
TAG_LOGD(AAFwkTag::ABILITYMGR, "end");
return true;
}
services/abilitymgr/src/interceptor/extension_control_interceptor.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ ErrCode ExtensionControlInterceptor::DoProcess(AbilityInterceptorParam param)
return EXTENSION_BLOCKED_BY_SERVICE_LIST;
}
TAG_LOGI(AAFwkTag::ABILITYMGR, "other ok.");
TAG_LOGD(AAFwkTag::ABILITYMGR, "other ok");
return ERR_OK;
}
services/abilitymgr/src/preload_uiext_state_observer.cpp
+1 -1
View File
@@ -26,7 +26,7 @@ PreLoadUIExtStateObserver::PreLoadUIExtStateObserver(
void PreLoadUIExtStateObserver::OnProcessDied(const AppExecFwk::ProcessData &processData)
{
auto diedProcessName = processData.processName;
TAG_LOGI(AAFwkTag::ABILITYMGR, "DiedProcessName is %{public}s.", diedProcessName.c_str());
TAG_LOGI(AAFwkTag::ABILITYMGR, "process:%{public}s", diedProcessName.c_str());
auto extensionRecord = extensionRecord_.lock();
if (extensionRecord != nullptr) {
auto hostPid = extensionRecord->hostPid_;
services/abilitymgr/src/resident_process_manager.cpp
+1 -1
View File
@@ -249,7 +249,7 @@ void ResidentProcessManager::OnAppStateChanged(const AppInfo &info)
bool localEnable = false;
auto rdbResult = AmsResidentProcessRdb::GetInstance().GetResidentProcessEnable(bundleName, localEnable);
if (rdbResult != Rdb_OK) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to obtain resident process properties. result: %{public}d", rdbResult);
TAG_LOGE(AAFwkTag::ABILITYMGR, "GetResidentProcessEnable failed: %{public}d", rdbResult);
return;
}
services/abilitymgr/src/sender_info.cpp
+3 -3
View File
@@ -21,7 +21,7 @@ namespace OHOS {
namespace AAFwk {
bool SenderInfo::ReadFromParcel(Parcel &parcel)
{
TAG_LOGI(AAFwkTag::ABILITYMGR, "call");
TAG_LOGD(AAFwkTag::ABILITYMGR, "call");
code = parcel.ReadInt32();
std::unique_ptr<Want> wantResquest(parcel.ReadParcelable<Want>());
@@ -53,7 +53,7 @@ bool SenderInfo::ReadFromParcel(Parcel &parcel)
SenderInfo *SenderInfo::Unmarshalling(Parcel &parcel)
{
TAG_LOGI(AAFwkTag::ABILITYMGR, "call");
TAG_LOGD(AAFwkTag::ABILITYMGR, "call");
SenderInfo *info = new (std::nothrow) SenderInfo();
if (info == nullptr) {
@@ -71,7 +71,7 @@ SenderInfo *SenderInfo::Unmarshalling(Parcel &parcel)
bool SenderInfo::Marshalling(Parcel &parcel) const
{
TAG_LOGI(AAFwkTag::ABILITYMGR, "call");
TAG_LOGD(AAFwkTag::ABILITYMGR, "call");
if (!parcel.WriteInt32(code)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to write code");
services/abilitymgr/src/sub_managers_helper.cpp
+1 -1
View File
@@ -445,7 +445,7 @@ bool SubManagersHelper::VerificationAllToken(const sptr<IRemoteObject> &token)
return true;
}
}
TAG_LOGE(AAFwkTag::ABILITYMGR, "Failed to verify all token.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "fail");
return false;
}
services/appmgr/src/app_mgr_service.cpp
+1 -1
View File
@@ -1084,7 +1084,7 @@ int32_t AppMgrService::NotifyHotReloadPage(const std::string &bundleName, const
int32_t AppMgrService::SetContinuousTaskProcess(int32_t pid, bool isContinuousTask)
{
if (!AAFwk::PermissionVerification::GetInstance()->CheckSpecificSystemAbilityAccessPermission(FOUNDATION_PROCESS)) {
TAG_LOGE(AAFwkTag::ABILITYMGR, "caller is not foundation.");
TAG_LOGE(AAFwkTag::ABILITYMGR, "caller not foundation");
return ERR_INVALID_OPERATION;
}
if (!IsReady()) {