diff --git a/frameworks/inner_api/sandbox_manager/src/sandbox_manager_kit.cpp b/frameworks/inner_api/sandbox_manager/src/sandbox_manager_kit.cpp index 6abc37e3d99e5e2bbd41204a1895cfe946146e01..2f1bccdc8211f6a27f18346106fd4f6aabb311d6 100644 --- a/frameworks/inner_api/sandbox_manager/src/sandbox_manager_kit.cpp +++ b/frameworks/inner_api/sandbox_manager/src/sandbox_manager_kit.cpp @@ -70,7 +70,7 @@ int32_t SandboxManagerKit::PersistPolicy( SANDBOXMANAGER_LOG_DEBUG(LABEL, "Called"); size_t policySize = policy.size(); if ((policySize == 0) || (tokenId == 0)) { - SANDBOXMANAGER_LOG_ERROR(LABEL, "PolicySize = %{public}u, tokenId = %{public}d.", + SANDBOXMANAGER_LOG_ERROR(LABEL, "PolicySize = %{public}u, tokenId = %{public}u.", static_cast(policySize), tokenId); return SandboxManagerErrCode::INVALID_PARAMTER; } @@ -84,7 +84,7 @@ int32_t SandboxManagerKit::UnPersistPolicy( SANDBOXMANAGER_LOG_DEBUG(LABEL, "Called"); size_t policySize = policy.size(); if ((policySize == 0) || (tokenId == 0)) { - SANDBOXMANAGER_LOG_ERROR(LABEL, "PolicySize = %{public}u, tokenId = %{public}d.", + SANDBOXMANAGER_LOG_ERROR(LABEL, "PolicySize = %{public}u, tokenId = %{public}u.", static_cast(policySize), tokenId); return SandboxManagerErrCode::INVALID_PARAMTER; } @@ -254,7 +254,7 @@ int32_t SandboxManagerKit::StartAccessingByTokenId(uint32_t tokenId) int32_t SandboxManagerKit::StartAccessingByTokenId(uint32_t tokenId, uint64_t timestamp) { - SANDBOXMANAGER_LOG_INFO(LABEL, "Input tokenId = %{public}d.", tokenId); + SANDBOXMANAGER_LOG_INFO(LABEL, "Input tokenId = %{public}u.", tokenId); if (tokenId == 0) { SANDBOXMANAGER_LOG_ERROR(LABEL, "Invalid input token."); return SandboxManagerErrCode::INVALID_PARAMTER; @@ -269,7 +269,7 @@ int32_t SandboxManagerKit::UnSetAllPolicyByToken(uint32_t tokenId) int32_t SandboxManagerKit::UnSetAllPolicyByToken(uint32_t tokenId, uint64_t timestamp) { - SANDBOXMANAGER_LOG_INFO(LABEL, "Input tokenId = %{public}d.", tokenId); + SANDBOXMANAGER_LOG_INFO(LABEL, "Input tokenId = %{public}u.", tokenId); if (tokenId == 0) { SANDBOXMANAGER_LOG_ERROR(LABEL, "Invalid input token."); return SandboxManagerErrCode::INVALID_PARAMTER; diff --git a/services/common/utils/data_size_report_adapter.cpp b/services/common/utils/data_size_report_adapter.cpp index 04a5ed334487a49833b6c914a33c0fb84bde6fa1..e57dcdcf9db141aee43f5c2b7ad51c36a8c6a155 100644 --- a/services/common/utils/data_size_report_adapter.cpp +++ b/services/common/utils/data_size_report_adapter.cpp @@ -70,6 +70,10 @@ bool GetInterval(time_t lastTime, time_t nowTime) void ReportUserDataSize() { time_t nowTime = time(nullptr); + if (nowTime == -1) { + SANDBOXMANAGER_LOG_ERROR(LABEL, "nowTime get failed!"); + return; + } if (GetInterval(g_lastTime, nowTime)) { g_lastTime = nowTime; std::thread task(ReportTask); diff --git a/services/sandbox_manager/main/cpp/src/media/media_path_support.cpp b/services/sandbox_manager/main/cpp/src/media/media_path_support.cpp index 4b940c58c4352425ce69bab54f9a029a34923c46..b36254122ce4581346db4305e52b7c62b153e642 100644 --- a/services/sandbox_manager/main/cpp/src/media/media_path_support.cpp +++ b/services/sandbox_manager/main/cpp/src/media/media_path_support.cpp @@ -99,7 +99,7 @@ int32_t SandboxManagerMedia::OperateModeToPhotoPermissionType(std::vector(want.GetParams().GetIntParam("accessTokenId", 0)); if (tokenId == 0) { - SANDBOXMANAGER_LOG_ERROR(LABEL, "Error tokenid = %{public}d.", tokenId); + SANDBOXMANAGER_LOG_ERROR(LABEL, "Error tokenid = %{public}u.", tokenId); return; } PolicyInfoManager::GetInstance().RemoveBundlePolicy(tokenId); - SANDBOXMANAGER_LOG_INFO(LABEL, "RemovebundlePolicy, tokenid = %{public}d.", tokenId); + SANDBOXMANAGER_LOG_INFO(LABEL, "RemovebundlePolicy, tokenid = %{public}u.", tokenId); } if (action == EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_CHANGED) { diff --git a/services/sandbox_manager/main/cpp/src/service/sandbox_manager_service.cpp b/services/sandbox_manager/main/cpp/src/service/sandbox_manager_service.cpp index f08e6429cbe5fa8604a183f252dfe23b6ed0ec8c..e77d76cc84155eacad9fda0caba5077b8a9e457d 100644 --- a/services/sandbox_manager/main/cpp/src/service/sandbox_manager_service.cpp +++ b/services/sandbox_manager/main/cpp/src/service/sandbox_manager_service.cpp @@ -179,7 +179,7 @@ int32_t SandboxManagerService::CleanPersistPolicyByPath(const std::vector