!187 DFX Enhancement

Merge pull request !187 from yujann/DFXEnhance
This commit is contained in:
openharmony_ci
2024-09-11 08:34:19 +00:00
committed by Gitee
2 changed files with 3 additions and 4 deletions
@@ -345,7 +345,6 @@ bool SecCompBase::CompareComponentBasicInfo(SecCompBase *other, bool isRectCheck
bool SecCompBase::ParseStyle(const nlohmann::json& json, const std::string& tag)
{
SC_LOG_ERROR(LABEL, "1111");
if ((json.find(tag) == json.end()) || !json.at(tag).is_object()) {
SC_LOG_ERROR(LABEL, "json: %{public}s tag invalid.", tag.c_str());
return false;
@@ -377,7 +376,6 @@ bool SecCompBase::ParseStyle(const nlohmann::json& json, const std::string& tag)
SC_LOG_ERROR(LABEL, "bg is invalid.");
return false;
}
SC_LOG_ERROR(LABEL, "2222");
return true;
}
} // namespace base
@@ -248,6 +248,7 @@ int32_t SecCompInfoHelper::GrantTempPermission(AccessToken::AccessTokenID tokenI
tokenId, "ohos.permission.APPROXIMATELY_LOCATION");
return SC_SERVICE_ERROR_PERMISSION_OPER_FAIL;
}
SC_LOG_INFO(LABEL, "Grant location permission, scid = %{public}d.", componentInfo->nodeId_);
return SC_OK;
}
case PASTE_COMPONENT:
@@ -255,14 +256,14 @@ int32_t SecCompInfoHelper::GrantTempPermission(AccessToken::AccessTokenID tokenI
if (res != SC_OK) {
return SC_SERVICE_ERROR_PERMISSION_OPER_FAIL;
}
SC_LOG_DEBUG(LABEL, "grant paste permission");
SC_LOG_INFO(LABEL, "Grant paste permission, scid = %{public}d.", componentInfo->nodeId_);
return SC_OK;
case SAVE_COMPONENT:
if (IsDlpSandboxCalling(tokenId)) {
SC_LOG_INFO(LABEL, "Dlp sandbox app are not allowed to use save component.");
return SC_SERVICE_ERROR_PERMISSION_OPER_FAIL;
}
SC_LOG_DEBUG(LABEL, "grant save permission");
SC_LOG_INFO(LABEL, "Grant save permission, scid = %{public}d.", componentInfo->nodeId_);
return SecCompPermManager::GetInstance().GrantTempSavePermission(tokenId);
default:
SC_LOG_ERROR(LABEL, "Parse component type unknown");