From 4e994194f6481cceadf5b6c2ddd3a5e6f8b79840 Mon Sep 17 00:00:00 2001 From: jiao Date: Thu, 4 Sep 2025 17:50:33 +0800 Subject: [PATCH 1/4] clean alarms Signed-off-by: jiao --- .../server/domain/device/src/audio_connected_device.cpp | 1 - .../server/domain/device/src/audio_device_lock.cpp | 3 --- .../server/domain/interrupt/src/audio_interrupt_zone.cpp | 1 - .../server/domain/pipe/src/audio_capturer_session.cpp | 1 - .../server/domain/volume/src/audio_adapter_manager.cpp | 1 - .../server/domain/volume/src/audio_volume_manager.cpp | 1 - .../server/infra/appclient/src/audio_background_manager.cpp | 2 -- .../server/infra/appclient/src/audio_bundle_manager.cpp | 1 - .../src/audio_policy_async_action_handler.cpp | 1 - .../server/infra/config/parser/src/audio_converter_parser.cpp | 3 --- .../server/infra/ipc_proxy/src/audio_server_proxy.cpp | 2 -- .../server/service/service_main/src/audio_core_service.cpp | 3 --- .../server/service/service_main/src/audio_policy_service.cpp | 2 -- 13 files changed, 22 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..37dea82d07 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,7 +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_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..a7d2aa80c4 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 @@ -114,7 +114,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); } } 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..cd4177209a 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"; 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 2c3a33005e..525c7b85cc 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 02e61f7391..1d25a8aba1 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 8eabfcd3bf..6245457554 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 10ce3b5fa5..86e1726026 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_policy_service.cpp b/services/audio_policy/server/service/service_main/src/audio_policy_service.cpp index e70f327702..7642267639 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 b1a94ac6560d28c7d9edd3363ea1ddeff295852f Mon Sep 17 00:00:00 2001 From: jiao Date: Mon, 8 Sep 2025 03:24:38 +0000 Subject: [PATCH 2/4] 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 a7d2aa80c4..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 @@ -21,7 +21,6 @@ namespace OHOS { namespace AudioStandard { -static constexpr uid_t UID_AUDIO = 1041; AudioInterruptZoneManager::AudioInterruptZoneManager() {} -- Gitee From fa6328de595573bea8d0ff52abb9a40083f15cd9 Mon Sep 17 00:00:00 2001 From: jiao Date: Mon, 8 Sep 2025 03:25:30 +0000 Subject: [PATCH 3/4] update services/audio_policy/server/domain/device/src/audio_connected_device.cpp. Signed-off-by: jiao --- .../server/domain/device/src/audio_connected_device.cpp | 1 - 1 file changed, 1 deletion(-) 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 37dea82d07..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,7 +291,6 @@ void AudioConnectedDevice::SetDisplayName(const std::string macAddress, const st for (auto device : connectedDevices_) { if (device->macAddress_ == macAddress) { device->deviceName_ = deviceName; - std::string name_ = device->deviceName_; } } } -- Gitee From 6feefab02722ddef2095783e08afd6f777bc6cea Mon Sep 17 00:00:00 2001 From: jiao Date: Mon, 8 Sep 2025 03:27:08 +0000 Subject: [PATCH 4/4] update services/audio_policy/server/domain/pipe/src/audio_capturer_session.cpp. Signed-off-by: jiao --- .../server/domain/pipe/src/audio_capturer_session.cpp | 1 - 1 file changed, 1 deletion(-) 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 cd4177209a..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 @@ -275,7 +275,6 @@ bool AudioCapturerSession::IsStreamValid(const std::shared_ptr> pipeList = AudioPipeManager::GetPipeManager()->GetPipeList(); std::shared_ptr incommingPipe = -- Gitee