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 81f8c3bc0a99888fd66ec784f777335165888d47..d4dfcae84deda19a0af4c8fb324efe9a37ad1015 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_lock.cpp b/services/audio_policy/server/domain/device/src/audio_device_lock.cpp index 5183e5f9f727e9327f52b574bc1ac871c19ad961..bf06ecb7fe07b555b50fb78619643bc48e4b4b31 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 56fb7d0bb7501952cbc980ee24073effe4873ba6..5458e23e6a11758df3faedb3dd35a3ac3d22aaa8 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() {} @@ -114,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); } } 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 c8b585e307bf0c219622ad0d29d911e251aba9ef..09c588fd670a571409cf19dcbaf9d957aa4b5f92 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/volume/src/audio_adapter_manager.cpp b/services/audio_policy/server/domain/volume/src/audio_adapter_manager.cpp index 2c3a33005e1a1e32a83e795a68b27d6feb297370..525c7b85cc598a89cb438c81382d78fe2a3cf2ed 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 71cd9961b62637f3c4164e549610eb66611cd49e..648d8adad1e51410be1dce54f227be8f4b8e2518 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 02e61f7391c00fa994ac589b6467800ef7b5c510..1d25a8aba1071c321c88b3734ad8d23495c32935 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 9d66549e5bec35cf559799765d67b8553c9c2255..ed8a3698b9a2d5f09ca961515bf98ede90463771 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 a1e3134306e6be09be4d3e9a99bc5f08325f8803..220f26d8dde1bb5d3ff2f6ab3f62efcedbf98bb9 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 9cd27e69e44679ca48b9bea19ad7b252f1b2300c..e54c474e1df14d2657b322576ad5ece2b7605dab 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 8eabfcd3bfe9d19be6e0156b1493c0ee84c8e40e..6245457554ce290982ea238366f8903b551f52e3 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 10ce3b5fa5c3c76e53c1bd69f38907daad45840d..86e172602629f912545459ecb68b599688f833f1 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 e70f327702aa0c52e6c5c3dc6328c629fb39144c..76422676393a09f0f94b528f81ce54593f64d1ee 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;