From f1c731410759b3d04aa6fc9a76269dfca2e9cf6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B1=9F=E8=AF=9A?= Date: Fri, 12 Sep 2025 18:34:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?Signed-off-by:=20=E6=9D=A8=E6=B1=9F?= =?UTF-8?q?=E8=AF=9A=20=20yjctest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/native/audiocapturer/src/audio_capturer.cpp | 10 +++++----- .../hdiadapter_new/source/audio_capture_source.cpp | 2 +- .../server/domain/stream/audio_stream_collector.cpp | 2 +- .../service/service_main/src/audio_policy_server.cpp | 2 +- .../audio_service/client/src/capturer_in_client.cpp | 2 +- services/audio_service/client/src/i_audio_stream.cpp | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 7275bc41a7..3e6f014362 100644 --- a/frameworks/native/audiocapturer/src/audio_capturer.cpp +++ b/frameworks/native/audiocapturer/src/audio_capturer.cpp @@ -310,7 +310,7 @@ int32_t AudioCapturerPrivate::SetParams(const AudioCapturerParams params) uint32_t flag = AUDIO_INPUT_FLAG_NORMAL; ret = AudioPolicyManager::GetInstance().CreateCapturerClient(streamDesc, flag, audioStreamParams.originalSessionId); CHECK_AND_RETURN_RET_LOG(ret == SUCCESS, ERR_OPERATION_FAILED, "CreateCapturerClient failed"); - AUDIO_INFO_LOG("StreamClientState for Capturer::CreateClient. id %{public}u, flag :%{public}u", + HILOG_COMM_INFO("StreamClientState for Capturer::CreateClient. id %{public}u, flag :%{public}u", audioStreamParams.originalSessionId, flag); streamClass = DecideStreamClassAndUpdateCapturerInfo(flag); @@ -772,7 +772,7 @@ bool AudioCapturerPrivate::Start() lock = std::unique_lock(capturerMutex_); } Trace trace("KeyAction AudioCapturer::Start " + std::to_string(sessionID_)); - AUDIO_INFO_LOG("StreamClientState for Capturer::Start. id %{public}u, sourceType: %{public}d", + HILOG_COMM_INFO("StreamClientState for Capturer::Start. id %{public}u, sourceType: %{public}d", sessionID_, audioInterrupt_.audioFocusType.sourceType); CapturerState state = GetStatusInner(); @@ -872,7 +872,7 @@ bool AudioCapturerPrivate::Pause() const lock = std::unique_lock(capturerMutex_); } Trace trace("KeyAction AudioCapturer::Pause " + std::to_string(sessionID_)); - AUDIO_INFO_LOG("StreamClientState for Capturer::Pause. id %{public}u", sessionID_); + HILOG_COMM_INFO("StreamClientState for Capturer::Pause. id %{public}u", sessionID_); CHECK_AND_RETURN_RET_LOG(!isSwitching_, false, "Operation failed, in switching"); // When user is intentionally pausing , Deactivate to remove from audio focus info list @@ -893,7 +893,7 @@ bool AudioCapturerPrivate::Stop() const lock = std::unique_lock(capturerMutex_); } Trace trace("KeyAction AudioCapturer::Stop " + std::to_string(sessionID_)); - AUDIO_INFO_LOG("StreamClientState for Capturer::Stop. id %{public}u", sessionID_); + HILOG_COMM_INFO("StreamClientState for Capturer::Stop. id %{public}u", sessionID_); CHECK_AND_RETURN_RET_LOG(!isSwitching_, false, "Operation failed, in switching"); WriteOverflowEvent(); @@ -919,7 +919,7 @@ bool AudioCapturerPrivate::Flush() const bool AudioCapturerPrivate::Release() { Trace trace("KeyAction AudioCapturer::Release" + std::to_string(sessionID_)); - AUDIO_INFO_LOG("StreamClientState for Capturer::Release. id %{public}u", sessionID_); + HILOG_COMM_INFO("StreamClientState for Capturer::Release. id %{public}u", sessionID_); std::unique_lock releaseLock; if (callbackLoopTid_ != gettid()) { // No need to add lock in callback thread to prevent deadlocks releaseLock = std::unique_lock(capturerMutex_); diff --git a/frameworks/native/hdiadapter_new/source/audio_capture_source.cpp b/frameworks/native/hdiadapter_new/source/audio_capture_source.cpp index a012c82263..a58a0db4cd 100644 --- a/frameworks/native/hdiadapter_new/source/audio_capture_source.cpp +++ b/frameworks/native/hdiadapter_new/source/audio_capture_source.cpp @@ -1024,7 +1024,7 @@ int32_t AudioCaptureSource::CreateCapture(void) InitAudioSampleAttr(param); InitDeviceDesc(deviceDesc); - AUDIO_INFO_LOG("create capture, halName: %{public}s, hdiSourceType: %{public}d, rate: %{public}u, " + HILOG_COMM_INFO("create capture, halName: %{public}s, hdiSourceType: %{public}d, rate: %{public}u, " "channel: %{public}u, format: %{public}u, devicePin: %{public}u, desc: %{public}s", halName_.c_str(), param.sourceType, param.sampleRate, param.channelCount, param.format, deviceDesc.pins, deviceDesc.desc); if (attr_.hasEcConfig || attr_.sourceType == SOURCE_TYPE_EC) { diff --git a/services/audio_policy/server/domain/stream/audio_stream_collector.cpp b/services/audio_policy/server/domain/stream/audio_stream_collector.cpp index b46314dd35..583244a159 100644 --- a/services/audio_policy/server/domain/stream/audio_stream_collector.cpp +++ b/services/audio_policy/server/domain/stream/audio_stream_collector.cpp @@ -528,7 +528,7 @@ int32_t AudioStreamCollector::UpdateCapturerStreamInternal(AudioStreamChangeInfo int32_t AudioStreamCollector::UpdateCapturerStream(AudioStreamChangeInfo &streamChangeInfo) { - AUDIO_INFO_LOG("UpdateCapturerStream client %{public}d state %{public}d session %{public}d", + HILOG_COMM_INFO("UpdateCapturerStream client %{public}d state %{public}d session %{public}d", streamChangeInfo.audioCapturerChangeInfo.clientUID, streamChangeInfo.audioCapturerChangeInfo.capturerState, streamChangeInfo.audioCapturerChangeInfo.sessionId); 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 f766ed1f7f..33908288f9 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 @@ -2396,7 +2396,7 @@ int32_t AudioPolicyServer::SetMicrophoneMuteAudioConfig(bool isMute) int32_t AudioPolicyServer::SetMicrophoneMutePersistent(bool isMute, int32_t typeIn) { PolicyType type = static_cast(typeIn); - AUDIO_INFO_LOG("Entered %{public}s isMute:%{public}d, type:%{public}d", __func__, isMute, type); + HILOG_COMM_INFO("Entered %{public}s isMute:%{public}d, type:%{public}d", __func__, isMute, type); bool hasPermission = VerifyPermission(MICROPHONE_CONTROL_PERMISSION); CHECK_AND_RETURN_RET_LOG(hasPermission, ERR_PERMISSION_DENIED, "MICROPHONE_CONTROL_PERMISSION permission denied"); diff --git a/services/audio_service/client/src/capturer_in_client.cpp b/services/audio_service/client/src/capturer_in_client.cpp index d770549fb2..1dded6b9a9 100644 --- a/services/audio_service/client/src/capturer_in_client.cpp +++ b/services/audio_service/client/src/capturer_in_client.cpp @@ -197,7 +197,7 @@ int32_t CapturerInClientInner::SetAudioStreamInfo(const AudioStreamParams info, const std::shared_ptr &proxyObj, const AudioPlaybackCaptureConfig &config) { - AUDIO_INFO_LOG("AudioStreamInfo, Sampling rate: %{public}d, channels: %{public}d, format: %{public}d, stream type:" + HILOG_COMM_INFO("AudioStreamInfo, Sampling rate: %{public}d, channels: %{public}d, format: %{public}d, stream type:" " %{public}d, encoding type: %{public}d", info.samplingRate, info.channels, info.format, eStreamType_, info.encoding); AudioXCollie guard("CapturerInClientInner::SetAudioStreamInfo", CREATE_TIMEOUT_IN_SECOND, diff --git a/services/audio_service/client/src/i_audio_stream.cpp b/services/audio_service/client/src/i_audio_stream.cpp index be5a07e5bd..6f5ab3ef96 100644 --- a/services/audio_service/client/src/i_audio_stream.cpp +++ b/services/audio_service/client/src/i_audio_stream.cpp @@ -377,7 +377,7 @@ bool IAudioStream::IsRecordChannelRelatedInfoValid(uint8_t channels, uint64_t ch AUDIO_ERR_LOG("AudioStream: not matched source channel and channel layout"); return false; } - return true; + return true; } } // namespace AudioStandard } // namespace OHOS -- Gitee From 8f29b54e9233a668d410e2ce9f0029333b229395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B1=9F=E8=AF=9A?= Date: Fri, 12 Sep 2025 10:41:46 +0000 Subject: [PATCH 2/3] update services/audio_service/client/src/i_audio_stream.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨江诚 --- services/audio_service/client/src/i_audio_stream.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/audio_service/client/src/i_audio_stream.cpp b/services/audio_service/client/src/i_audio_stream.cpp index 6f5ab3ef96..28a38dc68c 100644 --- a/services/audio_service/client/src/i_audio_stream.cpp +++ b/services/audio_service/client/src/i_audio_stream.cpp @@ -227,7 +227,7 @@ std::shared_ptr IAudioStream::GetPlaybackStream(StreamClass stream Trace trace("IAudioStream::GetPlaybackStream"); if (streamClass == FAST_STREAM || streamClass == VOIP_STREAM) { #ifdef SUPPORT_LOW_LATENCY - AUDIO_INFO_LOG("Create fast playback stream"); + HILOG_COMM_INFO("Create fast playback stream"); return std::make_shared(eStreamType, AUDIO_MODE_PLAYBACK, appUid); #else (void)params; @@ -258,7 +258,7 @@ std::shared_ptr IAudioStream::GetRecordStream(StreamClass streamCl #endif } if (streamClass == PA_STREAM) { - AUDIO_INFO_LOG("Create ipc record stream"); + HILOG_COMM_INFO("Create ipc record stream"); return CapturerInClient::GetInstance(eStreamType, appUid); } return nullptr; @@ -377,7 +377,7 @@ bool IAudioStream::IsRecordChannelRelatedInfoValid(uint8_t channels, uint64_t ch AUDIO_ERR_LOG("AudioStream: not matched source channel and channel layout"); return false; } - return true; + return true; } } // namespace AudioStandard } // namespace OHOS -- Gitee From a092adc5d84480be77cc665cd74a77720fe57d46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=B1=9F=E8=AF=9A?= Date: Mon, 15 Sep 2025 01:22:50 +0000 Subject: [PATCH 3/3] update services/audio_service/client/src/i_audio_stream.cpp. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 杨江诚 --- services/audio_service/client/src/i_audio_stream.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/services/audio_service/client/src/i_audio_stream.cpp b/services/audio_service/client/src/i_audio_stream.cpp index 28a38dc68c..04c493fd44 100644 --- a/services/audio_service/client/src/i_audio_stream.cpp +++ b/services/audio_service/client/src/i_audio_stream.cpp @@ -377,6 +377,14 @@ bool IAudioStream::IsRecordChannelRelatedInfoValid(uint8_t channels, uint64_t ch AUDIO_ERR_LOG("AudioStream: not matched source channel and channel layout"); return false; } + if (!res) { + HILOG_COMM_INFO("Check record permission failed: No permission."); + return false; + } + if (!HandleCheckRecorderBackgroundCapture(config)) { + HILOG_COMM_INFO("VerifyBackgroundCapture failed for callerUid:%{public}d", config.callerUid); + return false; + } return true; } } // namespace AudioStandard -- Gitee