From c5c5286d2288eeac355541896896df03dd2e231e Mon Sep 17 00:00:00 2001 From: wangsen1994 Date: Wed, 25 Jun 2025 10:04:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=8A=B6=E6=80=81=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: wangsen1994 --- ...nced_notification_distributed_manager_service.cpp | 12 ------------ .../src/soft_bus/distributed_device_service.cpp | 5 +++-- .../distributed/src/soft_bus/distributed_service.cpp | 1 - 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/services/ans/src/distributed_manager/advanced_notification_distributed_manager_service.cpp b/services/ans/src/distributed_manager/advanced_notification_distributed_manager_service.cpp index d56db1236..3232173aa 100644 --- a/services/ans/src/distributed_manager/advanced_notification_distributed_manager_service.cpp +++ b/services/ans/src/distributed_manager/advanced_notification_distributed_manager_service.cpp @@ -85,13 +85,6 @@ ErrCode AdvancedNotificationService::SetDistributedEnabledBySlot( return ERR_ANS_NON_SYSTEM_APP; } - if (!AccessTokenHelper::CheckPermission(OHOS_PERMISSION_NOTIFICATION_CONTROLLER)) { - ANS_LOGE("Permission Denied."); - message.ErrorCode(ERR_ANS_PERMISSION_DENIED).Append("No permission"); - NotificationAnalyticsUtil::ReportModifyEvent(message); - return ERR_ANS_PERMISSION_DENIED; - } - ErrCode result = NotificationPreferences::GetInstance()->SetDistributedEnabledBySlot(slotType, deviceType, enabled); if (result == ERR_OK && slotType == NotificationConstant::SlotType::LIVE_VIEW) { @@ -132,11 +125,6 @@ ErrCode AdvancedNotificationService::IsDistributedEnabledBySlot( return ERR_ANS_NON_SYSTEM_APP; } - if (!AccessTokenHelper::CheckPermission(OHOS_PERMISSION_NOTIFICATION_CONTROLLER)) { - ANS_LOGE("no permission"); - return ERR_ANS_PERMISSION_DENIED; - } - return NotificationPreferences::GetInstance()->IsDistributedEnabledBySlot(slotType, deviceType, enabled); } diff --git a/services/distributed/src/soft_bus/distributed_device_service.cpp b/services/distributed/src/soft_bus/distributed_device_service.cpp index c580a5540..2fba94a1a 100644 --- a/services/distributed/src/soft_bus/distributed_device_service.cpp +++ b/services/distributed/src/soft_bus/distributed_device_service.cpp @@ -336,10 +336,11 @@ void DistributedDeviceService::SetDeviceStatus(const std::shared_ptr& bo } int32_t status; if (stateBox.GetState(status)) { - int32_t result = NotificationHelper::SetTargetDeviceStatus(deviceName, status, + uint32_t state = (static_cast(status) << 1); + int32_t result = NotificationHelper::SetTargetDeviceStatus(deviceName, state, DEFAULT_LOCK_SCREEN_FLAG, device.udid_); ANS_LOGI("Dans set state %{public}s %{public}s %{public}d %{public}d.", deviceName.c_str(), - StringAnonymous(deviceId).c_str(), status, result); + StringAnonymous(deviceId).c_str(), state, result); } bool liveViewEnable; diff --git a/services/distributed/src/soft_bus/distributed_service.cpp b/services/distributed/src/soft_bus/distributed_service.cpp index f513ca486..bd825d7fa 100644 --- a/services/distributed/src/soft_bus/distributed_service.cpp +++ b/services/distributed/src/soft_bus/distributed_service.cpp @@ -343,7 +343,6 @@ void DistributedService::SyncDeviceStatus(int32_t status) ANS_LOGE("Check handler is null."); return; } - status = (static_cast(status) << 1); std::function task = std::bind([&, status]() { DistributedDeviceService::GetInstance().SyncDeviceStatus(DistributedDeviceService::STATE_TYPE_LOCKSCREEN, status, false, false); -- Gitee