From 85a89230e9e9a223317b44a650dc3f0a2e608ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B2=E6=99=93=E6=99=93?= Date: Wed, 12 Feb 2025 09:59:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E7=AD=89=E7=BA=A7=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 史晓晓 --- .../service/src/device_manager_service.cpp | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index 772787869..c36edc399 100755 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -329,7 +329,7 @@ int32_t DeviceManagerService::GetAllTrustedDeviceList(const std::string &pkgName LOGE("Invalid parameter, pkgName or extra is empty."); return ERR_DM_INPUT_PARA_INVALID; } - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller: %{public}s does not have permission to call GetAllTrustedDeviceList.", pkgName.c_str()); return ERR_DM_NO_PERMISSION; } @@ -347,7 +347,7 @@ int32_t DeviceManagerService::ShiftLNNGear(const std::string &pkgName, const std { LOGD("Begin for pkgName = %{public}s, callerId = %{public}s, isRefresh =" "%{public}d, isWakeUp = %{public}d", pkgName.c_str(), GetAnonyString(callerId).c_str(), isRefresh, isWakeUp); - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call ShiftLNNGear, pkgName = %{public}s", pkgName.c_str()); return ERR_DM_NO_PERMISSION; } @@ -390,7 +390,8 @@ int32_t DeviceManagerService::GetLocalDeviceInfo(DmDeviceInfo &info) { LOGD("Begin."); bool isOnlyShowNetworkId = false; - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!(PermissionManager::GetInstance().CheckNewPermission() || + PermissionManager::GetInstance().CheckNewPermission())) { LOGE("The caller does not have permission to call GetLocalDeviceInfo."); isOnlyShowNetworkId = true; } @@ -606,7 +607,8 @@ int32_t DeviceManagerService::StopAuthenticateDevice(const std::string &pkgName) int32_t DeviceManagerService::BindDevice(const std::string &pkgName, int32_t authType, const std::string &deviceId, const std::string &bindParam) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!(PermissionManager::GetInstance().CheckNewPermission() || + PermissionManager::GetInstance().CheckPermission())) { LOGE("The caller does not have permission to call BindDevice."); return ERR_DM_NO_PERMISSION; } @@ -641,7 +643,8 @@ int32_t DeviceManagerService::BindDevice(const std::string &pkgName, int32_t aut int32_t DeviceManagerService::UnBindDevice(const std::string &pkgName, const std::string &udidHash) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!(PermissionManager::GetInstance().CheckNewPermission() || + PermissionManager::GetInstance().CheckNewPermission())) { LOGE("The caller does not have permission to call UnBindDevice."); return ERR_DM_NO_PERMISSION; } @@ -691,7 +694,7 @@ int32_t DeviceManagerService::UnBindDevice(const std::string &pkgName, const std int32_t DeviceManagerService::UnBindDevice(const std::string &pkgName, const std::string &udidHash, const std::string &extra) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call UnBindDevice."); return ERR_DM_NO_PERMISSION; } @@ -1179,7 +1182,7 @@ int32_t DeviceManagerService::GetNetworkTypeByNetworkId(const std::string &pkgNa int32_t DeviceManagerService::ImportAuthCode(const std::string &pkgName, const std::string &authCode) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller: %{public}s does not have permission to call ImportAuthCode.", pkgName.c_str()); return ERR_DM_NO_PERMISSION; } @@ -1201,7 +1204,7 @@ int32_t DeviceManagerService::ImportAuthCode(const std::string &pkgName, const s int32_t DeviceManagerService::ExportAuthCode(std::string &authCode) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call ExportAuthCode."); return ERR_DM_NO_PERMISSION; } @@ -1334,7 +1337,7 @@ int32_t DeviceManagerService::StopDiscovering(const std::string &pkgName, int32_t DeviceManagerService::EnableDiscoveryListener(const std::string &pkgName, const std::map &discoverParam, const std::map &filterOptions) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } @@ -1351,7 +1354,7 @@ int32_t DeviceManagerService::EnableDiscoveryListener(const std::string &pkgName int32_t DeviceManagerService::DisableDiscoveryListener(const std::string &pkgName, const std::map &extraParam) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } @@ -1367,7 +1370,7 @@ int32_t DeviceManagerService::DisableDiscoveryListener(const std::string &pkgNam int32_t DeviceManagerService::StartAdvertising(const std::string &pkgName, const std::map &advertiseParam) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } @@ -1383,7 +1386,7 @@ int32_t DeviceManagerService::StartAdvertising(const std::string &pkgName, int32_t DeviceManagerService::StopAdvertising(const std::string &pkgName, const std::map &advertiseParam) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } @@ -1406,7 +1409,8 @@ int32_t DeviceManagerService::StopAdvertising(const std::string &pkgName, int32_t DeviceManagerService::BindTarget(const std::string &pkgName, const PeerTargetId &targetId, const std::map &bindParam) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!(PermissionManager::GetInstance().CheckNewPermission() || + PermissionManager::GetInstance().CheckPermission())) { LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } @@ -1446,7 +1450,7 @@ int32_t DeviceManagerService::BindTarget(const std::string &pkgName, const PeerT int32_t DeviceManagerService::UnbindTarget(const std::string &pkgName, const PeerTargetId &targetId, const std::map &unbindParam) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call"); return ERR_DM_NO_PERMISSION; } @@ -1527,7 +1531,7 @@ int32_t DeviceManagerService::DestroyPinHolder(const std::string &pkgName, const int32_t DeviceManagerService::DpAclAdd(const std::string &udid) { - if (!PermissionManager::GetInstance().CheckNewPermission()) { + if (!PermissionManager::GetInstance().CheckPermission()) { LOGE("The caller does not have permission to call DpAclAdd."); return ERR_DM_NO_PERMISSION; } -- Gitee