From f111d90a6a24c99185d4235b4c1ed5612b2ed4e4 Mon Sep 17 00:00:00 2001 From: jiao Date: Mon, 8 Sep 2025 15:18:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ffrt=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: jiao --- .../domain/device/src/audio_connected_device.cpp | 2 -- .../server/domain/device/src/audio_device_common.cpp | 1 - .../server/domain/device/src/audio_device_lock.cpp | 3 --- .../domain/interrupt/src/audio_interrupt_zone.cpp | 1 - .../server/domain/pipe/src/audio_capturer_session.cpp | 2 -- .../domain/pipe/src/audio_concurrency_service.cpp | 3 --- .../domain/volume/src/audio_adapter_manager.cpp | 1 - .../server/domain/volume/src/audio_volume_manager.cpp | 1 - .../infra/appclient/src/audio_background_manager.cpp | 2 -- .../infra/appclient/src/audio_bundle_manager.cpp | 1 - .../src/audio_policy_async_action_handler.cpp | 1 - .../config/parser/src/audio_converter_parser.cpp | 3 --- .../server/infra/ipc_proxy/src/audio_server_proxy.cpp | 2 -- .../service/service_main/src/audio_core_service.cpp | 3 --- .../service_main/src/audio_core_service_private.cpp | 2 -- .../service/service_main/src/audio_policy_server.cpp | 11 ----------- .../service/service_main/src/audio_policy_service.cpp | 2 -- 17 files changed, 41 deletions(-) diff --git a/services/audio_policy/server/domain/device/src/audio_connected_device.cpp b/services/audio_policy/server/domain/device/src/audio_connected_device.cpp index 81f8c3bc0a..d4dfcae84d 100644 --- a/services/audio_policy/server/domain/device/src/audio_connected_device.cpp +++ b/services/audio_policy/server/domain/device/src/audio_connected_device.cpp @@ -291,8 +291,6 @@ void AudioConnectedDevice::SetDisplayName(const std::string macAddress, const st for (auto device : connectedDevices_) { if (device->macAddress_ == macAddress) { device->deviceName_ = deviceName; - int32_t bluetoothId_ = device->deviceId_; - std::string name_ = device->deviceName_; } } } diff --git a/services/audio_policy/server/domain/device/src/audio_device_common.cpp b/services/audio_policy/server/domain/device/src/audio_device_common.cpp index 922efaefce..dba411c227 100644 --- a/services/audio_policy/server/domain/device/src/audio_device_common.cpp +++ b/services/audio_policy/server/domain/device/src/audio_device_common.cpp @@ -797,7 +797,6 @@ void AudioDeviceCommon::MoveToNewOutputDevice(std::shared_ptrdeviceType_, GetEncryptAddr(outputDevices.front()->macAddress_).c_str(), static_cast(reason)); - DeviceType oldDevice = rendererChangeInfo->outputDeviceInfo.deviceType_; auto oldRendererChangeInfo = std::make_shared(*rendererChangeInfo.get()); UpdateDeviceInfo(rendererChangeInfo->outputDeviceInfo, diff --git a/services/audio_policy/server/domain/device/src/audio_device_lock.cpp b/services/audio_policy/server/domain/device/src/audio_device_lock.cpp index 5183e5f9f7..bf06ecb7fe 100644 --- a/services/audio_policy/server/domain/device/src/audio_device_lock.cpp +++ b/services/audio_policy/server/domain/device/src/audio_device_lock.cpp @@ -30,9 +30,6 @@ namespace OHOS { namespace AudioStandard { -const int32_t DATA_LINK_CONNECTED = 11; -static constexpr int64_t WAIT_LOAD_DEFAULT_DEVICE_TIME_MS = 200; // 200ms -static constexpr int32_t RETRY_TIMES = 25; void AudioDeviceLock::DeInit() { diff --git a/services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp b/services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp index 56fb7d0bb7..f64a0c7a1e 100644 --- a/services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp +++ b/services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp @@ -21,7 +21,6 @@ namespace OHOS { namespace AudioStandard { -static constexpr uid_t UID_AUDIO = 1041; AudioInterruptZoneManager::AudioInterruptZoneManager() {} diff --git a/services/audio_policy/server/domain/pipe/src/audio_capturer_session.cpp b/services/audio_policy/server/domain/pipe/src/audio_capturer_session.cpp index c8b585e307..09c588fd67 100644 --- a/services/audio_policy/server/domain/pipe/src/audio_capturer_session.cpp +++ b/services/audio_policy/server/domain/pipe/src/audio_capturer_session.cpp @@ -33,7 +33,6 @@ namespace { namespace OHOS { namespace AudioStandard { namespace { -const uint32_t PCM_8_BIT = 8; const uint32_t SESSION_ID_INVALID = 0; const float RENDER_FRAME_INTERVAL_IN_SECONDS = 0.02; const std::string PIPE_PRIMARY_INPUT = "primary_input"; @@ -276,7 +275,6 @@ bool AudioCapturerSession::IsStreamValid(const std::shared_ptr> pipeList = AudioPipeManager::GetPipeManager()->GetPipeList(); std::shared_ptr incommingPipe = diff --git a/services/audio_policy/server/domain/pipe/src/audio_concurrency_service.cpp b/services/audio_policy/server/domain/pipe/src/audio_concurrency_service.cpp index eeb38226a2..c4a2cb814a 100644 --- a/services/audio_policy/server/domain/pipe/src/audio_concurrency_service.cpp +++ b/services/audio_policy/server/domain/pipe/src/audio_concurrency_service.cpp @@ -22,9 +22,6 @@ namespace OHOS { namespace AudioStandard { -namespace { -static const int64_t DELAY_CONTROL_TIME_NS = 100000000; // 100ms -} void AudioConcurrencyService::Init() { AUDIO_INFO_LOG("AudioConcurrencyService Init"); diff --git a/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp index 6a766478dd..89f4b7f1d3 100644 --- a/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp @@ -1443,7 +1443,6 @@ AudioIOHandle AudioAdapterManager::OpenAudioPort(std::shared_ptr AUDIO_INFO_LOG("[PipeExecInfo] pipe name %{public}s, moduleArgs %{public}s", pipeInfo->name_.c_str(), moduleArgs.c_str()); curActiveCount_++; - AudioIOHandle ioHandle = HDI_INVALID_ID; if (IsPaRoute(pipeInfo->routeFlag_)) { return OpenPaAudioPort(pipeInfo, paIndex, moduleArgs); } diff --git a/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp b/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp index 71cd9961b6..648d8adad1 100644 --- a/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp +++ b/services/audio_policy/server/domain/volume/src/audio_volume_manager.cpp @@ -35,7 +35,6 @@ namespace OHOS { namespace AudioStandard { -static const int64_t WAIT_RINGER_MODE_MUTE_RESET_TIME_MS = 500; // 500ms const int32_t DUAL_TONE_RING_VOLUME = 0; static std::string GetEncryptAddr(const std::string &addr) { diff --git a/services/audio_policy/server/infra/appclient/src/audio_background_manager.cpp b/services/audio_policy/server/infra/appclient/src/audio_background_manager.cpp index 6dd2317d58..05f8eeee13 100644 --- a/services/audio_policy/server/infra/appclient/src/audio_background_manager.cpp +++ b/services/audio_policy/server/infra/appclient/src/audio_background_manager.cpp @@ -33,8 +33,6 @@ namespace OHOS { namespace AudioStandard { -constexpr int32_t BOOTUP_MUSIC_UID = 1003; -static const int64_t WATI_PLAYBACK_TIME = 200000; // 200ms mutex g_isAllowedPlaybackListenerMutex; mutex g_backgroundMuteListenerMutex; diff --git a/services/audio_policy/server/infra/appclient/src/audio_bundle_manager.cpp b/services/audio_policy/server/infra/appclient/src/audio_bundle_manager.cpp index 9d66549e5b..ed8a3698b9 100644 --- a/services/audio_policy/server/infra/appclient/src/audio_bundle_manager.cpp +++ b/services/audio_policy/server/infra/appclient/src/audio_bundle_manager.cpp @@ -31,7 +31,6 @@ namespace { constexpr unsigned int GET_BUNDLE_TIME_OUT_SECONDS = 10; -constexpr int32_t API_VERSION_REMAINDER = 1000; constexpr int BUNDLE_MGR_SERVICE_SYS_ABILITY_ID = 401; } diff --git a/services/audio_policy/server/infra/async_action_handler/src/audio_policy_async_action_handler.cpp b/services/audio_policy/server/infra/async_action_handler/src/audio_policy_async_action_handler.cpp index a1e3134306..220f26d8dd 100644 --- a/services/audio_policy/server/infra/async_action_handler/src/audio_policy_async_action_handler.cpp +++ b/services/audio_policy/server/infra/async_action_handler/src/audio_policy_async_action_handler.cpp @@ -72,7 +72,6 @@ void AudioPolicyAsyncActionHandler::ProcessEvent(const AppExecFwk::InnerEvent::P { CHECK_AND_RETURN_LOG(event != nullptr, "event is nullptr"); - uint32_t eventId = event->GetInnerEventId(); std::shared_ptr action = event->GetSharedObject(); CHECK_AND_RETURN_LOG(action != nullptr, "action is nullptr"); action->Exec(); diff --git a/services/audio_policy/server/infra/config/parser/src/audio_converter_parser.cpp b/services/audio_policy/server/infra/config/parser/src/audio_converter_parser.cpp index 9cd27e69e4..e54c474e1d 100644 --- a/services/audio_policy/server/infra/config/parser/src/audio_converter_parser.cpp +++ b/services/audio_policy/server/infra/config/parser/src/audio_converter_parser.cpp @@ -34,9 +34,6 @@ static constexpr char AUDIO_CONVERTER_CONFIG_FILE[] = "/etc/audio/audio_converte static constexpr char AUDIO_CONVERTER_CONFIG_FILE[] = "/system/etc/audio/audio_converter_config.xml"; #endif -static constexpr int32_t FILE_CONTENT_ERROR = -2; -static constexpr int32_t FILE_PARSE_ERROR = -3; - enum XML_ERROR { XML_PARSE_RECOVER = 1 << 0, // recover on errors XML_PARSE_NOERROR = 1 << 5, // suppress error reports diff --git a/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp b/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp index 43dbdb9213..3a9418a563 100644 --- a/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp +++ b/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp @@ -68,7 +68,6 @@ float AudioServerProxy::GetMaxAmplitudeProxy(bool flag, std::string portName, So std::string identity = IPCSkeleton::ResetCallingIdentity(); float maxAmplitude = 0; - int32_t rest = gsp->GetMaxAmplitude(flag, portName, sourceType, maxAmplitude); IPCSkeleton::SetCallingIdentity(identity); return maxAmplitude; } @@ -413,7 +412,6 @@ bool AudioServerProxy::LoadAudioEffectLibrariesProxy(const std::vector CHECK_AND_RETURN_RET_LOG(gsp != nullptr, false, "Service proxy unavailable"); std::string identity = IPCSkeleton::ResetCallingIdentity(); bool hasEffectsLoaded = false; - int32_t res = gsp->LoadAudioEffectLibraries(libraries, effects, successEffectList, hasEffectsLoaded); IPCSkeleton::SetCallingIdentity(identity); return hasEffectsLoaded; } diff --git a/services/audio_policy/server/service/service_main/src/audio_core_service.cpp b/services/audio_policy/server/service/service_main/src/audio_core_service.cpp index 9ae231dd72..5fff0745ba 100644 --- a/services/audio_policy/server/service/service_main/src/audio_core_service.cpp +++ b/services/audio_policy/server/service/service_main/src/audio_core_service.cpp @@ -31,11 +31,8 @@ namespace OHOS { namespace AudioStandard { namespace { const size_t SELECT_DEVICE_HISTORY_LIMIT = 10; -const uint32_t FIRST_SESSIONID = 100000; static const char* CHECK_FAST_BLOCK_PREFIX = "Is_Fast_Blocked_For_AppName#"; static const int32_t BLUETOOTH_FETCH_RESULT_DEFAULT = 0; -static const int32_t BLUETOOTH_FETCH_RESULT_CONTINUE = 1; -static const int32_t BLUETOOTH_FETCH_RESULT_ERROR = 2; static constexpr int32_t MAX_TRY = 100; static constexpr int32_t DELAY_MS = 100; } diff --git a/services/audio_policy/server/service/service_main/src/audio_core_service_private.cpp b/services/audio_policy/server/service/service_main/src/audio_core_service_private.cpp index e0a5b38edf..5c9b09ce02 100644 --- a/services/audio_policy/server/service/service_main/src/audio_core_service_private.cpp +++ b/services/audio_policy/server/service/service_main/src/audio_core_service_private.cpp @@ -39,11 +39,9 @@ namespace AudioStandard { namespace { static const int32_t MEDIA_SERVICE_UID = 1013; const int32_t DATA_LINK_CONNECTED = 11; -const uint32_t FIRST_SESSIONID = 100000; const uid_t MCU_UID = 7500; const uid_t TV_SERVICE_UID = 7501; const int32_t AUDIO_EXT_UID = 1041; -constexpr uint32_t MAX_VALID_SESSIONID = UINT32_MAX - FIRST_SESSIONID; static const int VOLUME_LEVEL_DEFAULT_SIZE = 3; static const int32_t BLUETOOTH_FETCH_RESULT_DEFAULT = 0; static const int32_t BLUETOOTH_FETCH_RESULT_CONTINUE = 1; diff --git a/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp b/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp index 463c6936cb..20bdb310d4 100644 --- a/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp +++ b/services/audio_policy/server/service/service_main/src/audio_policy_server.cpp @@ -191,17 +191,6 @@ static std::string TranslateKeyEvent(const int32_t keyType) return event; } -static bool HasUsbDevice(const std::vector> &devices) -{ - for (auto &item : devices) { - CHECK_AND_CONTINUE(item != nullptr); - if (IsUsb(item->deviceType_) && !item->hasPair_) { - return true; - } - } - return false; -} - uint32_t AudioPolicyServer::TranslateErrorCode(int32_t result) { uint32_t resultForMonitor = 0; diff --git a/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp b/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp index 881a1aa0b2..e40039ea23 100644 --- a/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp +++ b/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp @@ -58,8 +58,6 @@ static const char* CHECK_FAST_BLOCK_PREFIX = "Is_Fast_Blocked_For_AppName#"; static const char* AUDIO_SERVICE_PKG = "audio_manager_service"; } -const int32_t UID_AUDIO = 1041; - mutex g_dataShareHelperMutex; bool AudioPolicyService::isBtListenerRegistered = false; bool AudioPolicyService::isBtCrashed = false; -- Gitee From f7a953fae2f83099b82d1cb8dc100bea640df41e Mon Sep 17 00:00:00 2001 From: jiao Date: Mon, 8 Sep 2025 07:57:05 +0000 Subject: [PATCH 2/3] update services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp. Signed-off-by: jiao --- .../server/domain/interrupt/src/audio_interrupt_zone.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp b/services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp index f64a0c7a1e..5458e23e6a 100644 --- a/services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp +++ b/services/audio_policy/server/domain/interrupt/src/audio_interrupt_zone.cpp @@ -113,7 +113,6 @@ int32_t AudioInterruptZoneManager::ReleaseAudioInterruptZone(const int32_t zoneI it->first.streamUsage == STREAM_USAGE_MOVIE)) { ForceStopAudioFocusInZone(zoneId, it->first); } else { - int32_t destZoneId = func(it->first.uid, it->first.deviceTag, "", it->first.streamUsage); service_->ActivateAudioInterruptInternal(zoneId, it->first, false, updateScene); } } -- Gitee From 371d10ea38a144d5edc5f0d09a5aecf3533fd454 Mon Sep 17 00:00:00 2001 From: jiao Date: Tue, 9 Sep 2025 02:16:47 +0000 Subject: [PATCH 3/3] update services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp. Signed-off-by: jiao --- .../server/infra/ipc_proxy/src/audio_server_proxy.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp b/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp index 3a9418a563..583f4d6eb8 100644 --- a/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp +++ b/services/audio_policy/server/infra/ipc_proxy/src/audio_server_proxy.cpp @@ -68,6 +68,8 @@ float AudioServerProxy::GetMaxAmplitudeProxy(bool flag, std::string portName, So std::string identity = IPCSkeleton::ResetCallingIdentity(); float maxAmplitude = 0; + int32_t rest = gsp->GetMaxAmplitude(flag, portName, sourceType, maxAmplitude); + AUDIO_DEBUG_LOG("rest is %{public}d", rest); IPCSkeleton::SetCallingIdentity(identity); return maxAmplitude; } @@ -412,6 +414,8 @@ bool AudioServerProxy::LoadAudioEffectLibrariesProxy(const std::vector CHECK_AND_RETURN_RET_LOG(gsp != nullptr, false, "Service proxy unavailable"); std::string identity = IPCSkeleton::ResetCallingIdentity(); bool hasEffectsLoaded = false; + int32_t res = gsp->LoadAudioEffectLibraries(libraries, effects, successEffectList, hasEffectsLoaded); + AUDIO_DEBUG_LOG("res is %{public}d", res); IPCSkeleton::SetCallingIdentity(identity); return hasEffectsLoaded; } -- Gitee