From c9deb9046cf94853bbfbed9e96ae221f7cd9aacd Mon Sep 17 00:00:00 2001
From: wangchen <wangchen240@huawei.com>
Date: Tue, 2 Sep 2025 17:32:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E6=94=B9=20close=20?=
 =?UTF-8?q?#ICVSNW=20Signed-off-by:=20wangchen=20<wangchen240@huawei.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sandbox_manager/src/sandbox_manager_kit.cpp    |  8 ++++----
 services/common/utils/data_size_report_adapter.cpp |  4 ++++
 .../main/cpp/src/media/media_path_support.cpp      |  8 ++++----
 .../sensitive/sandbox_manager_event_subscriber.cpp |  4 ++--
 .../cpp/src/service/sandbox_manager_service.cpp    | 14 +++++++-------
 5 files changed, 21 insertions(+), 17 deletions(-)

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 6abc37e..2f1bccd 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<uint32_t>(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<uint32_t>(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 04a5ed3..e57dcdc 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 4b940c5..b362541 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<uint32
         } else if (mode[i] == OperateMode::WRITE_MODE + OperateMode::READ_MODE) {
             out.emplace_back(Media::PhotoPermissionType::GRANT_PERSIST_READWRITE_IMAGEVIDEO);
         } else {
-            SANDBOXMANAGER_LOG_ERROR(LABEL, "OperateModeToPhotoPermissionType error, err mode = %{public}d", mode[i]);
+            SANDBOXMANAGER_LOG_ERROR(LABEL, "OperateModeToPhotoPermissionType error, err mode = %{public}u", mode[i]);
             return INVALID_PARAMTER;
         }
     }
@@ -117,7 +117,7 @@ int32_t SandboxManagerMedia::OperateModeToMediaOperationMode(std::vector<uint32_
         } else if (mode[i] == OperateMode::WRITE_MODE + OperateMode::READ_MODE) {
             out.emplace_back(Media::OperationMode::READ_WRITE_MODE);
         } else {
-            SANDBOXMANAGER_LOG_ERROR(LABEL, "OperateModeToMediaOperationMode error, err mode = %{public}d", mode[i]);
+            SANDBOXMANAGER_LOG_ERROR(LABEL, "OperateModeToMediaOperationMode error, err mode = %{public}u", mode[i]);
             return INVALID_PARAMTER;
         }
     }
@@ -155,7 +155,7 @@ int32_t SandboxManagerMedia::CheckPolicyBeforeGrant(uint32_t tokenId, std::vecto
             needGrantMode.emplace_back(mode[i]);
         } else {
             std::string maskPath = SandboxManagerLog::MaskRealPath(uris[i].c_str());
-            SANDBOXMANAGER_LOG_ERROR(LABEL, "Uris:%{public}s, had no policy%{public}d", maskPath.c_str(), mode[i]);
+            SANDBOXMANAGER_LOG_ERROR(LABEL, "Uris:%{public}s, had no policy%{public}u", maskPath.c_str(), mode[i]);
         }
     }
     ret = OperateModeToPhotoPermissionType(needGrantMode, type);
@@ -256,7 +256,7 @@ int32_t SandboxManagerMedia::CheckPolicyBeforeCancel(uint32_t tokenId, std::vect
             needCancelMode.emplace_back(mode[i]);
         } else {
             std::string maskPath = SandboxManagerLog::MaskRealPath(uris[i].c_str());
-            SANDBOXMANAGER_LOG_ERROR(LABEL, "Uris:%{public}s, had no policy%{public}d", maskPath.c_str(), mode[i]);
+            SANDBOXMANAGER_LOG_ERROR(LABEL, "Uris:%{public}s, had no policy%{public}u", maskPath.c_str(), mode[i]);
         }
     }
 
diff --git a/services/sandbox_manager/main/cpp/src/sensitive/sandbox_manager_event_subscriber.cpp b/services/sandbox_manager/main/cpp/src/sensitive/sandbox_manager_event_subscriber.cpp
index 0716623..9465f61 100644
--- a/services/sandbox_manager/main/cpp/src/sensitive/sandbox_manager_event_subscriber.cpp
+++ b/services/sandbox_manager/main/cpp/src/sensitive/sandbox_manager_event_subscriber.cpp
@@ -81,11 +81,11 @@ void SandboxManagerCommonEventSubscriber::OnReceiveEvent(const EventFwk::CommonE
         action == EventFwk::CommonEventSupport::COMMON_EVENT_PACKAGE_DATA_CLEARED) {
         uint32_t tokenId = static_cast<uint32_t>(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 f08e642..e77d76c 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<std::s
     DelayUnloadService();
     uint32_t callingTokenId = IPCSkeleton::GetCallingTokenID();
     if (!IsFileManagerCalling(callingTokenId)) {
-        SANDBOXMANAGER_LOG_ERROR(LABEL, "Permission denied(tokenID=%{public}d)", callingTokenId);
+        SANDBOXMANAGER_LOG_ERROR(LABEL, "Permission denied(tokenID=%{public}u)", callingTokenId);
         return PERMISSION_DENIED;
     }
     size_t filePathSize = filePathList.size();
@@ -195,7 +195,7 @@ int32_t SandboxManagerService::CleanPolicyByUserId(uint32_t userId, const std::v
     DelayUnloadService();
     uint32_t callingTokenId = IPCSkeleton::GetCallingTokenID();
     if (!IsFileManagerCalling(callingTokenId)) {
-        SANDBOXMANAGER_LOG_ERROR(LABEL, "Permission denied(tokenID=%{public}d)", callingTokenId);
+        SANDBOXMANAGER_LOG_ERROR(LABEL, "Permission denied(tokenID=%{public}u)", callingTokenId);
         return PERMISSION_DENIED;
     }
 
@@ -330,7 +330,7 @@ int32_t SandboxManagerService::PersistPolicyByTokenId(
     size_t policySize = policy.size();
     if ((policySize == 0) || (tokenId == 0)) {
         SANDBOXMANAGER_LOG_ERROR(
-            LABEL, "Policy vector size error or invalid tokenid, size = %{public}zu, tokenid = %{public}d.",
+            LABEL, "Policy vector size error or invalid tokenid, size = %{public}zu, tokenid = %{public}u.",
             policy.size(), tokenId);
         return INVALID_PARAMTER;
     }
@@ -365,7 +365,7 @@ int32_t SandboxManagerService::UnPersistPolicyByTokenId(
     size_t policySize = policy.size();
     if ((policySize == 0) || (tokenId == 0)) {
         SANDBOXMANAGER_LOG_ERROR(
-            LABEL, "Policy vector size error or invalid tokenid, size = %{public}zu, tokenid = %{public}d.",
+            LABEL, "Policy vector size error or invalid tokenid, size = %{public}zu, tokenid = %{public}u.",
             policy.size(), tokenId);
         return INVALID_PARAMTER;
     }
@@ -554,7 +554,7 @@ int32_t SandboxManagerService::CheckPersistPolicy(
     }
     size_t policySize = policy.size();
     if (policySize == 0 || tokenId == 0) {
-        SANDBOXMANAGER_LOG_ERROR(LABEL, "Policy vector size error, size = %{public}zu, tokenid = %{public}d.",
+        SANDBOXMANAGER_LOG_ERROR(LABEL, "Policy vector size error, size = %{public}zu, tokenid = %{public}u.",
             policy.size(), tokenId);
         return INVALID_PARAMTER;
     }
@@ -767,11 +767,11 @@ bool SandboxManagerService::CheckPermission(const uint32_t tokenId, const std::s
 {
     int32_t ret = Security::AccessToken::AccessTokenKit::VerifyAccessToken(tokenId, permission);
     if (ret == Security::AccessToken::PermissionState::PERMISSION_GRANTED) {
-        SANDBOXMANAGER_LOG_INFO(LABEL, "Check permission token:%{public}d pass", tokenId);
+        SANDBOXMANAGER_LOG_INFO(LABEL, "Check permission token:%{public}u pass", tokenId);
         return true;
     }
     SandboxManagerDfxHelper::WritePermissionCheckFailEvent(permission, tokenId);
-    SANDBOXMANAGER_LOG_ERROR(LABEL, "Check permission token:%{public}d fail", tokenId);
+    SANDBOXMANAGER_LOG_ERROR(LABEL, "Check permission token:%{public}u fail", tokenId);
     return false;
 }
 
-- 
Gitee