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 d56db12361a6c93da21161c2704fff5c89743ab0..3232173aafbfa0cf625930ef53b7eae347d7b6f4 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 c580a55401ffe9652e34f0193cb471d603b2aaa4..2fba94a1abdc91cea6347099256a9d2bdb7d429a 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 f513ca486a1a175d21032b85ca4131e01e0495aa..bd825d7fa2807e6edb971269af35d04fa6f8cd14 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);