From 7f8779a764120240094d9174972ae725df0d353d Mon Sep 17 00:00:00 2001 From: yjguo Date: Fri, 12 Sep 2025 19:32:27 +0800 Subject: [PATCH 1/2] add Signed-off-by: yjguo --- .../domain/interrupt/src/audio_interrupt_service.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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..086ea2ed05 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 @@ -2872,10 +2872,13 @@ bool AudioInterruptService::ShouldCallbackToClient(uint32_t uid, int32_t streamI } const sptr gsp = GetAudioServerProxy(); std::string identity = IPCSkeleton::ResetCallingIdentity(); - CHECK_AND_RETURN_RET_LOG(gsp != nullptr, true, "error for g_adProxy null"); + if (gsp == nullptr) { + AUDIO_ERR_LOG("error for g_adProxy null"); + IPCSkeleton::SetCallingIdentity(identity); + return true; + } AUDIO_INFO_LOG("mute flag is: %{public}d", muteFlag); gsp->SetNonInterruptMute(streamId, muteFlag); - IPCSkeleton::SetCallingIdentity(identity); return false; } -- Gitee From fba0fa2baaf08ef6e9715a9a5b8316f91f0d502c Mon Sep 17 00:00:00 2001 From: yjguo Date: Fri, 12 Sep 2025 19:39:05 +0800 Subject: [PATCH 2/2] add1 Signed-off-by: yjguo --- .../server/domain/interrupt/src/audio_interrupt_service.cpp | 1 + 1 file changed, 1 insertion(+) 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 086ea2ed05..ed00581bb6 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 @@ -2879,6 +2879,7 @@ bool AudioInterruptService::ShouldCallbackToClient(uint32_t uid, int32_t streamI } AUDIO_INFO_LOG("mute flag is: %{public}d", muteFlag); gsp->SetNonInterruptMute(streamId, muteFlag); + IPCSkeleton::SetCallingIdentity(identity); return false; } -- Gitee