diff --git a/services/distributedhardwarefwkservice/src/task/disable_task.cpp b/services/distributedhardwarefwkservice/src/task/disable_task.cpp index 8fb417d54c8dd0e60d58df7fefc8dc7def2d77bc..98e4435724b37dd0ff249e7e1127f31de89c6688 100644 --- a/services/distributedhardwarefwkservice/src/task/disable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/disable_task.cpp @@ -148,30 +148,20 @@ int32_t DisableTask::GetCallingPid() int32_t DisableTask::DoAutoDisable() { - bool disableSink = false; - bool disableSource = false; - int32_t ret = ComponentManager::GetInstance().CheckDemandStart(GetUUID(), GetDhType(), disableSink, disableSource); - if (ret != DH_FWK_SUCCESS) { - DHLOGE("CheckDemandStart failed!"); - return ret; - } + int32_t ret = DH_FWK_SUCCESS; if (DHContext::GetInstance().GetRealTimeOnlineDeviceCount() == 0 && DHContext::GetInstance().GetIsomerismConnectCount() == 0) { DHDescriptor dhDescriptor { .id = GetDhId(), .dhType = GetDhType() }; - if (disableSink) { - ret = ComponentManager::GetInstance().ForceDisableSink(dhDescriptor); - if (ret != DH_FWK_SUCCESS) { - DHLOGE("DisableSink failed!"); - } + ret = ComponentManager::GetInstance().ForceDisableSink(dhDescriptor); + if (ret != DH_FWK_SUCCESS) { + DHLOGE("DisableSink failed!"); } - if (disableSource) { - ret = ComponentManager::GetInstance().ForceDisableSource(GetNetworkId(), dhDescriptor); - if (ret != DH_FWK_SUCCESS) { - DHLOGE("DisableSource failed!"); - } + ret = ComponentManager::GetInstance().ForceDisableSource(GetNetworkId(), dhDescriptor); + if (ret != DH_FWK_SUCCESS) { + DHLOGE("DisableSource failed!"); } } return ret;