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_common.cpp b/services/audio_policy/server/domain/device/src/audio_device_common.cpp index 922efaefce5fcc1a45b24126ff0c0e07483a32f8..dba411c22741d4cb50916b8bd39cb953894f451a 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 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/pipe/src/audio_concurrency_service.cpp b/services/audio_policy/server/domain/pipe/src/audio_concurrency_service.cpp index eeb38226a2a1d4e0896c70aabfbef861e7412c59..c4a2cb814a57d4d64c33999155e4adfdff0cbd18 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 6a766478dd8fa74ec7b3df8a4011994e9c88cb91..89f4b7f1d30aed5f3b8f7223e0f67c89d2f0457f 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 6dd2317d58c998b01c5307cc3e734437f95b994f..05f8eeee13003c429991790a0737cc06384ce7b1 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 43dbdb92132d70b4b0196962d63689ceda8ae3cd..583f4d6eb83e28e6f51f1d13af089efccd7c19b1 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 @@ -69,6 +69,7 @@ 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; } @@ -414,6 +415,7 @@ bool AudioServerProxy::LoadAudioEffectLibrariesProxy(const std::vector 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; } 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 9ae231dd72e87dec0c96197aa06173e6b75af7a0..5fff0745ba58acce7fa14f821257c73f60b2b778 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 e0a5b38edf40b905ac34401bc85a0cf675420850..5c9b09ce0255747413dd1f140c67fa146637951f 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 463c6936cb90291262845e60505797beaf1083ee..20bdb310d4fe9cc78280f6dc12f10b2598cc07b9 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 881a1aa0b2ae20baa9e940dcc708fb0c9db04920..e40039ea23bb018318ed53b40c1d690f553d3c0f 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;