From c4dec91254160b480545f4ca27e30cafffa8eeab Mon Sep 17 00:00:00 2001 From: m30053149 Date: Sat, 13 Sep 2025 16:27:56 +0800 Subject: [PATCH] optimize interface getBundleNameFromUid Signed-off-by: m30053149 --- .../native/audiorenderer/src/audio_renderer.cpp | 1 + .../domain/interrupt/src/audio_interrupt_service.cpp | 11 ++++------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/frameworks/native/audiorenderer/src/audio_renderer.cpp b/frameworks/native/audiorenderer/src/audio_renderer.cpp index 798fe4ff9a..213a185fda 100644 --- a/frameworks/native/audiorenderer/src/audio_renderer.cpp +++ b/frameworks/native/audiorenderer/src/audio_renderer.cpp @@ -477,6 +477,7 @@ int32_t AudioRendererPrivate::InitAudioInterruptCallback(bool isRestoreAudio) audioInterrupt_.contentType = rendererInfo_.contentType; audioInterrupt_.sessionStrategy = strategy_; audioInterrupt_.api = rendererInfo_.playerType; + audioInterrupt_.bundleName = AudioSystemManager::GetInstance()->GetSelfBundleName(appInfo_.appUid); AUDIO_INFO_LOG("interruptMode %{public}d, streamType %{public}d, sessionID %{public}d", audioInterrupt_.mode, audioInterrupt_.audioFocusType.streamType, audioInterrupt_.streamId); diff --git a/services/audio_policy/server/domain/interrupt/src/audio_interrupt_service.cpp b/services/audio_policy/server/domain/interrupt/src/audio_interrupt_service.cpp index 3796a938da..e8485dc83c 100644 --- a/services/audio_policy/server/domain/interrupt/src/audio_interrupt_service.cpp +++ b/services/audio_policy/server/domain/interrupt/src/audio_interrupt_service.cpp @@ -953,8 +953,6 @@ int32_t AudioInterruptService::ActivateAudioInterruptInternal(const int32_t zone void AudioInterruptService::PrintLogsOfFocusStrategyBaseMusic(const AudioInterrupt &audioInterrupt) { // The log printed by this function is critical, so please do not modify it. - std::string bundleName = (AudioBundleManager::GetBundleInfoFromUid(audioInterrupt.uid)).name; - AudioFocusType audioFocusType; audioFocusType.streamType = AudioStreamType::STREAM_MUSIC; std::pair focusPair = std::make_pair(audioFocusType, audioInterrupt.audioFocusType); @@ -964,7 +962,7 @@ void AudioInterruptService::PrintLogsOfFocusStrategyBaseMusic(const AudioInterru AUDIO_WARNING_LOG("The audio focus strategy based on music: forceType: %{public}d, hintType: %{public}d, " \ "actionOn: %{public}d. Caller info: pid [%{public}d], uid [%{public}d], bundleName [%{public}s].", focusEntry.forceType, focusEntry.hintType, focusEntry.actionOn, - audioInterrupt.pid, audioInterrupt.uid, bundleName.c_str()); + audioInterrupt.pid, audioInterrupt.uid, audioInterrupt.bundleName.c_str()); return; } // Update focus strategy by audio session. @@ -1603,8 +1601,7 @@ void AudioInterruptService::ProcessActiveInterrupt(const int32_t zoneId, const A ++iterActive; } uint8_t appstate = GetAppState(currentInterrupt.pid); - auto info = AudioBundleManager::GetBundleInfoFromUid(currentInterrupt.uid); - dfxBuilder.WriteEffectMsg(appstate, info.name, currentInterrupt, interruptEvent.hintType); + dfxBuilder.WriteEffectMsg(appstate, currentInterrupt.bundleName, currentInterrupt, interruptEvent.hintType); SendActiveInterruptEvent(activeStreamId, interruptEvent, incomingInterrupt, currentInterrupt); } @@ -1805,8 +1802,8 @@ void AudioInterruptService::UpdateAudioFocusStrategy(const AudioInterrupt &curre int32_t incomingPid = incomingInterrupt.pid; AudioFocusType incomingAudioFocusType = incomingInterrupt.audioFocusType; AudioFocusType existAudioFocusType = currentInterrupt.audioFocusType; - std::string bundleName = GetAudioInterruptBundleName(incomingInterrupt); - std::string currentBundleName = GetCurrentBundleName(static_cast(currentUid)); + std::string bundleName = incomingInterrupt.bundleName; + std::string currentBundleName = currentInterrupt.bundleName; CHECK_AND_RETURN_LOG(!bundleName.empty(), "bundleName is empty"); AudioStreamType existStreamType = existAudioFocusType.streamType; AudioStreamType incomingStreamType = incomingAudioFocusType.streamType; -- Gitee