From 8e2e2ba0363cc212cb2d8323913df2db33cc6a64 Mon Sep 17 00:00:00 2001 From: zhixiang_song Date: Sat, 27 Dec 2025 11:30:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AA=92=E4=BD=93=E5=BA=93=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=96=B0so=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhixiang_song --- services/uripermmgr/BUILD.gn | 4 +- .../include/media_permission_manager.h | 4 +- .../src/media_permission_manager.cpp | 40 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/services/uripermmgr/BUILD.gn b/services/uripermmgr/BUILD.gn index 94131256af..427f66fbac 100644 --- a/services/uripermmgr/BUILD.gn +++ b/services/uripermmgr/BUILD.gn @@ -105,7 +105,7 @@ ohos_shared_library("libupms") { if (ability_runtime_media_library_enable) { sources += [ "src/media_permission_manager.cpp" ] - external_deps += [ "media_library:media_library_extend_manager" ] + external_deps += [ "media_library:media_permission_helper" ] defines += [ "ABILITY_RUNTIME_MEDIA_LIBRARY_ENABLE" ] } @@ -182,7 +182,7 @@ ohos_static_library("libupms_static") { if (ability_runtime_media_library_enable) { sources += [ "src/media_permission_manager.cpp" ] - external_deps += [ "media_library:media_library_extend_manager" ] + external_deps += [ "media_library:media_permission_helper" ] defines += [ "ABILITY_RUNTIME_MEDIA_LIBRARY_ENABLE" ] } diff --git a/services/uripermmgr/include/media_permission_manager.h b/services/uripermmgr/include/media_permission_manager.h index cb6158c38c..8e3b376fd3 100644 --- a/services/uripermmgr/include/media_permission_manager.h +++ b/services/uripermmgr/include/media_permission_manager.h @@ -20,7 +20,7 @@ #include #include "uri.h" -#include "media_library_extend_manager.h" +#include "media_permission_helper.h" namespace OHOS { namespace AAFwk { @@ -37,7 +37,7 @@ public: private: MediaPermissionManager(); - Media::MediaLibraryExtendManager *GetMediaLibraryManager(); + Media::MediaPermissionHelper *GetMediaPermissionHelper(); Media::PhotoPermissionType FlagToFileOpenMode(uint32_t flag); Media::HideSensitiveType ConvertHideSensitiveType(int32_t hideSensitiveType); }; diff --git a/services/uripermmgr/src/media_permission_manager.cpp b/services/uripermmgr/src/media_permission_manager.cpp index aac1cbe286..6051089a0c 100644 --- a/services/uripermmgr/src/media_permission_manager.cpp +++ b/services/uripermmgr/src/media_permission_manager.cpp @@ -39,16 +39,16 @@ MediaPermissionManager &MediaPermissionManager::GetInstance() MediaPermissionManager::MediaPermissionManager() {} -Media::MediaLibraryExtendManager *MediaPermissionManager::GetMediaLibraryManager() +Media::MediaPermissionHelper *MediaPermissionManager::GetMediaPermissionHelper() { - TAG_LOGI(AAFwkTag::URIPERMMGR, "GetMediaLibraryExtendManager."); - auto mediaLibraryManager = Media::MediaLibraryExtendManager::GetMediaLibraryExtendManager(); - if (mediaLibraryManager == nullptr) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "GetMediaLibraryExtendManager failed."); - return mediaLibraryManager; + TAG_LOGI(AAFwkTag::URIPERMMGR, "GetMediaPermissionHelper."); + auto mediaPermissionHelper = Media::MediaPermissionHelper::GetMediaPermissionHelper(); + if (mediaPermissionHelper == nullptr) { + TAG_LOGE(AAFwkTag::URIPERMMGR, "GetMediaPermissionHelper failed."); + return mediaPermissionHelper; } - mediaLibraryManager->InitMediaLibraryExtendManager(); - return mediaLibraryManager; + mediaPermissionHelper->InitMediaPermissionHelper(); + return mediaPermissionHelper; } std::vector MediaPermissionManager::CheckUriPermission(const std::vector &uriVec, @@ -59,13 +59,13 @@ std::vector MediaPermissionManager::CheckUriPermission(const std::vector results = std::vector(uriVec.size(), false); flag &= (Want::FLAG_AUTH_READ_URI_PERMISSION | Want::FLAG_AUTH_WRITE_URI_PERMISSION); - auto mediaLibraryManager = GetMediaLibraryManager(); - if (mediaLibraryManager == nullptr) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "GetMediaLibraryManager failed."); + auto mediaPermissionHelper = GetMediaPermissionHelper(); + if (mediaPermissionHelper == nullptr) { + TAG_LOGE(AAFwkTag::URIPERMMGR, "GetMediaPermissionHelper failed."); return results; } std::vector flags(uriVec.size(), flag); - auto ret = IN_PROCESS_CALL(mediaLibraryManager->CheckPhotoUriPermission(callerTokenId, uriVec, results, flags)); + auto ret = IN_PROCESS_CALL(mediaPermissionHelper->CheckPhotoUriPermission(callerTokenId, uriVec, results, flags)); TAG_LOGD(AAFwkTag::URIPERMMGR, "CheckPhotoUriPermission finished."); if (ret != ERR_OK) { TAG_LOGE(AAFwkTag::URIPERMMGR, "Check photo uri permission failed, ret is %{public}d", ret); @@ -89,14 +89,14 @@ int32_t MediaPermissionManager::GrantUriPermission(const std::vector(photoPermissionType), hideSensitiveType); - auto mediaLibraryManager = GetMediaLibraryManager(); - if (mediaLibraryManager == nullptr) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "GetMediaLibraryManager failed."); + auto mediaPermissionHelper = GetMediaPermissionHelper(); + if (mediaPermissionHelper == nullptr) { + TAG_LOGE(AAFwkTag::URIPERMMGR, "GetMediaPermissionHelper failed."); return INNER_ERR; } auto mediahideSensitiveType = ConvertHideSensitiveType(hideSensitiveType); std::vector photoPermissionTypes(uris.size(), photoPermissionType); - auto ret = IN_PROCESS_CALL(mediaLibraryManager->GrantPhotoUriPermission( + auto ret = IN_PROCESS_CALL(mediaPermissionHelper->GrantPhotoUriPermission( callerTokenId, targetTokenId, uris, photoPermissionTypes, mediahideSensitiveType)); TAG_LOGD(AAFwkTag::URIPERMMGR, "GrantPhotoUriPermission finished."); if (ret != ERR_OK) { @@ -130,12 +130,12 @@ int32_t MediaPermissionManager::RevokeUriPermission(uint32_t callerTokenId, uint TAG_LOGI(AAFwkTag::URIPERMMGR, "called, %{private}u, %{private}u, %{private}s", callerTokenId, targetTokenId, uri.c_str()); std::vector uris = {uri}; - auto mediaLibraryManager = GetMediaLibraryManager(); - if (mediaLibraryManager == nullptr) { - TAG_LOGE(AAFwkTag::URIPERMMGR, "GetMediaLibraryManager failed."); + auto mediaPermissionHelper = GetMediaPermissionHelper(); + if (mediaPermissionHelper == nullptr) { + TAG_LOGE(AAFwkTag::URIPERMMGR, "GetMediaPermissionHelper failed."); return INNER_ERR; } - auto ret = IN_PROCESS_CALL(mediaLibraryManager->CancelPhotoUriPermission(callerTokenId, targetTokenId, uris)); + auto ret = IN_PROCESS_CALL(mediaPermissionHelper->CancelPhotoUriPermission(callerTokenId, targetTokenId, uris)); if (ret != ERR_OK) { TAG_LOGE(AAFwkTag::URIPERMMGR, "Revoke media uri permission failed, ret:%{public}d", ret); return ret;