已合并
media library completely decoupled #3507
Hermits创建于 2025年10月11日
media library completely decoupled #3507
已合并
共 6 个文件变更+2-17
| @@ -105,11 +105,6 @@ int32_t DataSyncManager::CleanCloudFile(const int32_t userId, const std::string | |||
| 105 | return E_OK; | 105 | return E_OK; |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | int32_t DataSyncManager::CleanRemainFile(const std::string &bundleName, const int32_t userId) | ||
| 109 | { | ||
| 110 | return E_OK; | ||
| 111 | } | ||
| 112 | |||
| 113 | int32_t DataSyncManager::OptimizeStorage(const std::string &bundleName, const int32_t userId, const int32_t agingDays) | 108 | int32_t DataSyncManager::OptimizeStorage(const std::string &bundleName, const int32_t userId, const int32_t agingDays) |
| 114 | { | 109 | { |
| 115 | return E_OK; | 110 | return E_OK; |
| @@ -61,7 +61,6 @@ public: | |||
| 61 | bool needClean, | 61 | bool needClean, |
| 62 | int32_t timeout = -1); | 62 | int32_t timeout = -1); |
| 63 | virtual int32_t CleanCloudFile(const int32_t userId, const std::string &bundleName, const int action); | 63 | virtual int32_t CleanCloudFile(const int32_t userId, const std::string &bundleName, const int action); |
| 64 | virtual int32_t CleanRemainFile(const std::string &bundleName, const int32_t userId); | ||
| 65 | virtual int32_t OptimizeStorage(const std::string &bundleName, const int32_t userId, const int32_t agingDays); | 64 | virtual int32_t OptimizeStorage(const std::string &bundleName, const int32_t userId, const int32_t agingDays); |
| 66 | virtual int32_t StartOptimizeStorage(const BundleNameUserInfo &bundleNameUserInfo, | 65 | virtual int32_t StartOptimizeStorage(const BundleNameUserInfo &bundleNameUserInfo, |
| 67 | const CloudSync::OptimizeSpaceOptions &optimizeOptions, | 66 | const CloudSync::OptimizeSpaceOptions &optimizeOptions, |
| @@ -3,7 +3,7 @@ | |||
| 3 | "name": "cloudfiledaemon", | 3 | "name": "cloudfiledaemon", |
| 4 | "path": ["/system/bin/sa_main", "/system/profile/cloudfiledaemon.json"], | 4 | "path": ["/system/bin/sa_main", "/system/profile/cloudfiledaemon.json"], |
| 5 | "uid": "1009", | 5 | "uid": "1009", |
| 6 | "gid": ["dfs", "user_data_rw", "ddms", "dfs_share", "media_rw", "readproc"], | 6 | "gid": ["dfs", "user_data_rw", "dfs_share", "media_rw", "readproc"], |
| 7 | "caps": ["CHOWN"], | 7 | "caps": ["CHOWN"], |
| 8 | "sandbox": 0, | 8 | "sandbox": 0, |
| 9 | "secon": "u:r:cloudfiledaemon:s0", | 9 | "secon": "u:r:cloudfiledaemon:s0", |
| @@ -39,10 +39,6 @@ int32_t OptimizeStorageTask::RunTaskForBundle(int32_t userId, std::string bundle | |||
| 39 | return E_NULLPTR; | 39 | return E_NULLPTR; |
| 40 | } | 40 | } |
| 41 | auto dataSyncManager_ = GetDataSyncManager(); | 41 | auto dataSyncManager_ = GetDataSyncManager(); |
 | |||
| 42 | if (dataSyncManager_->CleanRemainFile(bundleName, userId) != E_OK) { | ||
| 43 | LOGW(" clean reamin file fail"); | ||
| 44 | } | ||
| 45 | |||
| 46 | int32_t agingDays = -1; | 42 | int32_t agingDays = -1; |
| 47 | int32_t agingPolicy = -1; | 43 | int32_t agingPolicy = -1; |
| 48 | if (bundleName == HDC_BUNDLE_NAME) { | 44 | if (bundleName == HDC_BUNDLE_NAME) { |
| @@ -37,7 +37,7 @@ | |||
| 37 | "name": "cloudfileservice", | 37 | "name": "cloudfileservice", |
| 38 | "path": ["/system/bin/sa_main", "/system/profile/cloudfileservice.json"], | 38 | "path": ["/system/bin/sa_main", "/system/profile/cloudfileservice.json"], |
| 39 | "uid": "dfs", | 39 | "uid": "dfs", |
| 40 | "gid": ["dfs", "user_data_rw", "ddms", "dfs_share", "media_rw"], | 40 | "gid": ["dfs", "user_data_rw", "dfs_share", "media_rw"], |
| 41 | "caps": ["CHOWN"], | 41 | "caps": ["CHOWN"], |
| 42 | "sandbox": 0, | 42 | "sandbox": 0, |
| 43 | "jobs" : { | 43 | "jobs" : { |
| @@ -118,11 +118,6 @@ int32_t DataSyncManager::CleanCloudFile(const int32_t userId, const std::string | |||
| 118 | } | 118 | } |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | int32_t DataSyncManager::CleanRemainFile(const std::string &bundleName, const int32_t userId) | ||
| 122 | { | ||
| 123 | return E_OK; | ||
| 124 | } | ||
| 125 | |||
| 126 | int32_t DataSyncManager::OptimizeStorage(const std::string &bundleName, const int32_t userId, const int32_t agingDays) | 121 | int32_t DataSyncManager::OptimizeStorage(const std::string &bundleName, const int32_t userId, const int32_t agingDays) |
| 127 | { | 122 | { |
| 128 | return E_OK; | 123 | return E_OK; |
dataSyncManager_ 为什么不需要进行判空？