From 65ad794144d0d16a2cb9f4cdfbba719544760af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=80=80=E6=96=87?= Date: Tue, 9 Sep 2025 14:36:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=9F=B3=E9=87=8F=E5=AE=89?= =?UTF-8?q?=E8=A7=84=E6=B5=8B=E8=AF=95=E6=97=B6=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 陈耀文 --- services/audio_policy/etc/audio_config.para | 2 +- .../server/domain/volume/include/audio_adapter_manager.h | 2 +- .../server/domain/volume/src/audio_adapter_manager.cpp | 2 +- .../server/domain/volume/src/audio_volume_manager.cpp | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/services/audio_policy/etc/audio_config.para b/services/audio_policy/etc/audio_config.para index 1535cde3e7..40c67dda4f 100644 --- a/services/audio_policy/etc/audio_config.para +++ b/services/audio_policy/etc/audio_config.para @@ -14,7 +14,7 @@ persist.multimedia.audio.audioCacheState = 2 const.multimedia.audio.fixedvolume = false const.multimedia.audio.volumestep = 1 persist.multimedia.audio.safevolume = 15 -persist.multimedia.audio.safevolume.timeout = 1140 +persist.multimedia.audio.safevolume.timeout = 1080 persist.multimedia.audio.firstboot = 1 const.multimedia.audio.proaudioEnable = 0 persist.multimedia.audio.anco_focus_control = 1 diff --git a/services/audio_policy/server/domain/volume/include/audio_adapter_manager.h b/services/audio_policy/server/domain/volume/include/audio_adapter_manager.h index fdcea314e5..8344f0e385 100644 --- a/services/audio_policy/server/domain/volume/include/audio_adapter_manager.h +++ b/services/audio_policy/server/domain/volume/include/audio_adapter_manager.h @@ -317,7 +317,7 @@ private: static constexpr int32_t APP_MIN_VOLUME_LEVEL = 0; static constexpr int32_t APP_DEFAULT_VOLUME_LEVEL = 25; static constexpr int32_t CONST_FACTOR = 100; - static constexpr int32_t DEFAULT_SAFE_VOLUME_TIMEOUT = 1140; + static constexpr int32_t DEFAULT_SAFE_VOLUME_TIMEOUT = 1080; static constexpr int32_t CONVERT_FROM_MS_TO_SECONDS = 1000; static constexpr float MIN_STREAM_VOLUME = 0.0f; static constexpr float MAX_STREAM_VOLUME = 1.0f; 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 f47ba066b5..b8a98b7ae6 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 @@ -155,7 +155,7 @@ bool AudioAdapterManager::Init() } char safeVolumeTimeout[6] = {0}; - ret = GetParameter("persist.multimedia.audio.safevolume.timeout", "1140", + ret = GetParameter("persist.multimedia.audio.safevolume.timeout", "1080", safeVolumeTimeout, sizeof(safeVolumeTimeout)); if (ret > 0) { safeVolumeTimeout_ = atoi(safeVolumeTimeout); 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 71cd9961b6..04bfa97f25 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 @@ -54,6 +54,7 @@ static std::string GetEncryptAddr(const std::string &addr) } const int32_t ONE_MINUTE = 60; +const int32_t HALF_MINUTE = 30; const uint32_t ABS_VOLUME_SUPPORT_RETRY_INTERVAL_IN_MICROSECONDS = 10000; constexpr int32_t CANCEL_FORCE_CONTROL_VOLUME_TYPE = -1; @@ -845,7 +846,7 @@ int32_t AudioVolumeManager::CheckActiveMusicTime() startSafeTime_ = 0; startSafeTimeBt_ = 0; } - sleep(ONE_MINUTE); + sleep(HALF_MINUTE); } return 0; } -- Gitee