diff --git a/frameworks/native/audiocapturer/src/audio_capturer.cpp b/frameworks/native/audiocapturer/src/audio_capturer.cpp index 7275bc41a75356f339611626edff2dbc604c4111..3e6f014362d8a58008cd981fd1a09630f9734dd7 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 a012c82263959c006fb7fcccd843870c33d02dd3..a58a0db4cd70d0bcb54c46b5c18fdddb8849ae20 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 b46314dd35effa5765e576d0e44bf6640968fb5e..583244a15997ff2960418422780008ae5ddc9fcb 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 f766ed1f7f5d743d795fefad78009c03abfea498..33908288f993a0389f8c744cdcea20ff629ab83a 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 d770549fb28622a4144ef37a1faa679fbe9ce313..1dded6b9a9a17e7297f654f73d344601267a4e92 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 be5a07e5bda70223f4d7e7f853e4dcff5f91296b..04c493fd4450cb907a8b770d33454b9bdc2c3213 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,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