diff --git a/services/audio_service/server/src/audio_endpoint.cpp b/services/audio_service/server/src/audio_endpoint.cpp index 9b26ea56fe5e16007cade70acf802fd6a5ee9564..2bf07fd24539f162be419d9ffd1586e6ec95d893 100644 --- a/services/audio_service/server/src/audio_endpoint.cpp +++ b/services/audio_service/server/src/audio_endpoint.cpp @@ -1387,7 +1387,7 @@ AudioEndpointInner::VolumeResult AudioEndpointInner::CalculateVolume(size_t i) VolumeResult result; if (deviceInfo_.networkId_ != LOCAL_NETWORK_ID || (deviceInfo_.deviceType_ == DEVICE_TYPE_BLUETOOTH_A2DP && volumeType == STREAM_MUSIC && PolicyHandler::GetInstance().IsAbsVolumeSupported()) || !getVolumeRet || - IsNearlinkAbsVolSupportStream(deviceInfo_.deviceType_, volumeType)) { + IsNearlinkAbsVolSupportStream(deviceType, volumeType)) { result.volumeStart = vol.isMute ? 0 : static_cast(baseVolume); } else if (clientConfig_.rendererInfo.isVirtualKeyboard) { result.volumeStart = vol.isMute ? 0 : static_cast(baseVolume); diff --git a/services/audio_service/server/src/audio_server.cpp b/services/audio_service/server/src/audio_server.cpp index fe72497d9914196b6e3b2097039000c3f1888cce..f19767a67c6c44a67e0261168f57074f844628ad 100644 --- a/services/audio_service/server/src/audio_server.cpp +++ b/services/audio_service/server/src/audio_server.cpp @@ -1415,12 +1415,12 @@ int32_t AudioServer::SetIORoutes(DeviceType type, DeviceFlag flag, std::vectorUpdateActiveDevice(deviceTypes); PolicyHandler::GetInstance().SetActiveOutputDevice(type); + sink->UpdateActiveDevice(deviceTypes); } else if (flag == DeviceFlag::ALL_DEVICES_FLAG) { UpdateDeviceForAllSource(source, type); - sink->UpdateActiveDevice(deviceTypes); PolicyHandler::GetInstance().SetActiveOutputDevice(type); + sink->UpdateActiveDevice(deviceTypes); } else { AUDIO_ERR_LOG("SetIORoutes invalid device flag"); return ERR_INVALID_PARAM;