From 5999d7f54821b7a2491dbafff7b63c9520a2a508 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Mon, 4 Dec 2023 14:44:52 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8C=85=E7=9A=84=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: I09b5fad7e7aaf01d2a884651c65156baa4bb3077 --- .../backup_sa/src/module_external/bms_adapter.cpp | 10 ++++++++-- .../backup_sa/src/module_external/sms_adapter.cpp | 13 ++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/services/backup_sa/src/module_external/bms_adapter.cpp b/services/backup_sa/src/module_external/bms_adapter.cpp index 2e2a25e94..a83683619 100644 --- a/services/backup_sa/src/module_external/bms_adapter.cpp +++ b/services/backup_sa/src/module_external/bms_adapter.cpp @@ -118,7 +118,10 @@ vector BundleMgrAdapter::GetBundleInfos(int32_t use continue; } auto [allToBackup, extName, restoreDeps] = GetAllowAndExtName(installedBundle.extensionInfos); - auto dataSize = GetBundleStats(installedBundle.name, userId); + int64_t dataSize = 0; + if (allToBackup) { + dataSize = GetBundleStats(installedBundle.name, userId); + } bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo {installedBundle.name, installedBundle.versionCode, installedBundle.versionName, dataSize, allToBackup, extName, false, restoreDeps}); @@ -142,7 +145,10 @@ vector BundleMgrAdapter::GetBundleInfos(const vecto continue; } auto [allToBackup, extName, restoreDeps] = GetAllowAndExtName(installedBundle.extensionInfos); - auto dataSize = GetBundleStats(installedBundle.name, userId); + int64_t dataSize = 0; + if (allToBackup) { + dataSize = GetBundleStats(installedBundle.name, userId); + } bundleInfos.emplace_back(BJsonEntityCaps::BundleInfo {installedBundle.name, installedBundle.versionCode, installedBundle.versionName, dataSize, allToBackup, extName, false, restoreDeps}); diff --git a/services/backup_sa/src/module_external/sms_adapter.cpp b/services/backup_sa/src/module_external/sms_adapter.cpp index e6613ed2c..592a7acaa 100644 --- a/services/backup_sa/src/module_external/sms_adapter.cpp +++ b/services/backup_sa/src/module_external/sms_adapter.cpp @@ -28,6 +28,8 @@ using namespace std; namespace { const string MEDIA_LIBRARY_HAP = "com.ohos.medialibrary.medialibrarydata"; const string EXTERNAL_FILE_HAP = "com.ohos.UserFile.ExternalFileManager"; +const string MEDIA_TYPE = "media"; +const string FILE_TYPE = "file"; } // namespace static sptr GetStorageManager() @@ -59,14 +61,19 @@ int64_t StorageMgrAdapter::GetUserStorageStats(const std::string &bundleName, in { StorageManager::StorageStats bundleStats; auto storageMgr = GetStorageManager(); - if (storageMgr->GetUserStorageStats(userId, bundleStats)) { - throw BError(BError::Codes::SA_BROKEN_IPC, "Failed to get user storage stats"); - } if (bundleName == MEDIA_LIBRARY_HAP) { + if (storageMgr->GetUserStorageStatsByType(userId, bundleStats, MEDIA_TYPE)) { + throw BError(BError::Codes::SA_BROKEN_IPC, "Failed to get user storage stats"); + } + return bundleStats.image_ + bundleStats.video_; } else if (bundleName == EXTERNAL_FILE_HAP) { + if (storageMgr->GetUserStorageStatsByType(userId, bundleStats, FILE_TYPE)) { + throw BError(BError::Codes::SA_BROKEN_IPC, "Failed to get user storage stats"); + } return bundleStats.file_; } + return 0; } } // namespace OHOS::FileManagement::Backup -- Gitee From 315e1e1fab7d97223e707fae3d4a1d0f8dc9c6c9 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Thu, 7 Dec 2023 06:54:55 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8C=85=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B0=8F=E7=9A=84=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: I07f2b6184af435bd3dd5a6271eab5f90d6c19467 --- services/backup_sa/src/module_external/sms_adapter.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/services/backup_sa/src/module_external/sms_adapter.cpp b/services/backup_sa/src/module_external/sms_adapter.cpp index 592a7acaa..75cd654ee 100644 --- a/services/backup_sa/src/module_external/sms_adapter.cpp +++ b/services/backup_sa/src/module_external/sms_adapter.cpp @@ -65,7 +65,6 @@ int64_t StorageMgrAdapter::GetUserStorageStats(const std::string &bundleName, in if (storageMgr->GetUserStorageStatsByType(userId, bundleStats, MEDIA_TYPE)) { throw BError(BError::Codes::SA_BROKEN_IPC, "Failed to get user storage stats"); } - return bundleStats.image_ + bundleStats.video_; } else if (bundleName == EXTERNAL_FILE_HAP) { if (storageMgr->GetUserStorageStatsByType(userId, bundleStats, FILE_TYPE)) { @@ -73,7 +72,6 @@ int64_t StorageMgrAdapter::GetUserStorageStats(const std::string &bundleName, in } return bundleStats.file_; } - return 0; } } // namespace OHOS::FileManagement::Backup -- Gitee