From f162359107af7488241b3cf849196d508fb35676 Mon Sep 17 00:00:00 2001 From: zhangwenting15 Date: Thu, 28 Aug 2025 17:35:42 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"!10469=20=E6=96=B0=E5=A2=9E=E6=9D=A5?= =?UTF-8?q?=E7=94=B5=E9=9F=B3=E5=92=8C=E9=80=9A=E7=9F=A5=E9=9F=B3=E5=88=86?= =?UTF-8?q?=E5=BC=80=E8=AE=BE=E7=BD=AE=E8=83=BD=E5=8A=9B"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2edc4ea1191ebfea59548c446861cd7d01b8ae8a, reversing changes made to 8379dbff2a67945eb6943744f4995994eecafae2. --- .../include/audio_policy_manager.h | 5 ---- .../src/audio_policy_ext_unit_test.cpp | 21 -------------- .../src/audio_policy_unit_test.cpp | 29 ------------------- .../service/src/audio_policy_manager.cpp | 24 --------------- .../src/audio_volume_manager_unit_test.cpp | 19 ------------ .../client/src/audio_group_manager.cpp | 10 ------- 6 files changed, 108 deletions(-) diff --git a/frameworks/native/audiopolicy/include/audio_policy_manager.h b/frameworks/native/audiopolicy/include/audio_policy_manager.h index e7ed0c6773..24e8886b23 100644 --- a/frameworks/native/audiopolicy/include/audio_policy_manager.h +++ b/frameworks/native/audiopolicy/include/audio_policy_manager.h @@ -61,9 +61,6 @@ public: int32_t SetSystemVolumeLevel(AudioVolumeType volumeType, int32_t volumeLevel, bool isLegacy = false, int32_t volumeFlag = 0, int32_t uid = 0); - int32_t SetSystemNotificationVolumeLevel(AudioVolumeType volumeType, int32_t volumeLevel, bool isLegacy = false, - int32_t volumeFlag = 0, int32_t uid = 0); - int32_t SetSystemVolumeLevelWithDevice(AudioVolumeType volumeType, int32_t volumeLevel, DeviceType deviceType, int32_t volumeFlag = 0); int32_t SetAppVolumeLevel(int32_t appUid, int32_t volumeLevel, int32_t volumeFlag = 0); @@ -82,8 +79,6 @@ public: int32_t GetSystemVolumeLevel(AudioVolumeType volumeType, int32_t uid = 0); - int32_t GetSystemNotificationVolumeLevel(AudioVolumeType volumeType, int32_t uid = 0); - int32_t GetAppVolumeLevel(int32_t appUid, int32_t &volumeLevel); int32_t GetSelfAppVolumeLevel(int32_t &volumeLevel); diff --git a/frameworks/native/audiopolicy/test/unittest/policy_test/src/audio_policy_ext_unit_test.cpp b/frameworks/native/audiopolicy/test/unittest/policy_test/src/audio_policy_ext_unit_test.cpp index 64da4d1ec4..fcafc2616f 100644 --- a/frameworks/native/audiopolicy/test/unittest/policy_test/src/audio_policy_ext_unit_test.cpp +++ b/frameworks/native/audiopolicy/test/unittest/policy_test/src/audio_policy_ext_unit_test.cpp @@ -348,27 +348,6 @@ HWTEST(AudioPolicyExtUnitTest, RecoverAudioPolicyCallbackClient_002, TestSize.Le EXPECT_EQ(volumeLevel, ret); } -/** - * @tc.name : Test RecoverAudioPolicyCallbackClient - * @tc.number: RecoverAudioPolicyCallbackClient_003 - * @tc.desc : Test RecoverAudioPolicyCallbackClient interface abnormal branch. - */ -HWTEST(AudioPolicyExtUnitTest, RecoverAudioPolicyCallbackClient_003, TestSize.Level3) -{ - int32_t ret; - int32_t volumeLevel = 4; - ret = AudioPolicyManager::GetInstance().SetSystemVolumeLevel(AudioVolumeType::STREAM_NOTIFICATION, volumeLevel); - EXPECT_EQ(SUCCESS, ret); - ret = AudioPolicyManager::GetInstance().GetSystemVolumeLevel(AudioVolumeType::STREAM_NOTIFICATION); - EXPECT_EQ(volumeLevel, ret); - - AudioPolicyManager::GetInstance().audioPolicyClientStubCB_ = nullptr; - AudioPolicyManager::GetInstance().RecoverAudioPolicyCallbackClient(); - - ret = AudioPolicyManager::GetInstance().GetSystemVolumeLevel(AudioVolumeType::STREAM_NOTIFICATION); - EXPECT_EQ(volumeLevel, ret); -} - /** * @tc.name : Test AudioPolicyServerDied * @tc.number: AudioPolicyServerDied_001 diff --git a/frameworks/native/audiopolicy/test/unittest/policy_test/src/audio_policy_unit_test.cpp b/frameworks/native/audiopolicy/test/unittest/policy_test/src/audio_policy_unit_test.cpp index 168f6966a2..6a350eb224 100644 --- a/frameworks/native/audiopolicy/test/unittest/policy_test/src/audio_policy_unit_test.cpp +++ b/frameworks/native/audiopolicy/test/unittest/policy_test/src/audio_policy_unit_test.cpp @@ -1077,20 +1077,6 @@ HWTEST(AudioPolicyUnitTest, SetSystemVolumeLevel_014, TestSize.Level1) EXPECT_EQ(SUCCESS, ret); } -/** - * @tc.name : Test SetSystemVolumeLevel - * @tc.number: SetSystemVolumeLevel_015 - * @tc.desc : Test SetSystemVolumeLevel interface. Returns SUCCESS. - */ -HWTEST(AudioPolicyUnitTest, SetSystemVolumeLevel_015, TestSize.Level1) -{ - AudioVolumeType volumeType = STREAM_NOTIFICATION; - int32_t volumeLevel = 6; - int32_t volumeFlag = 1; - int32_t ret = AudioPolicyManager::GetInstance().SetSystemVolumeLevel(volumeType, volumeLevel, API_9, volumeFlag); - EXPECT_EQ(SUCCESS, ret); -} - /** * @tc.name : Test GetSystemVolumeLevel * @tc.number: GetSystemVolumeLevel_001 @@ -1202,21 +1188,6 @@ HWTEST(AudioPolicyUnitTest, GetSystemVolumeLevel_006, TestSize.Level1) EXPECT_EQ(volumeLevel, ret); } -/** - * @tc.name : Test GetSystemVolumeLevel - * @tc.number: GetSystemVolumeLevel_007 - * @tc.desc : Test GetSystemVolumeLevel interface. Returns volumeLevel. - */ -HWTEST(AudioPolicyUnitTest, GetSystemVolumeLevel_007, TestSize.Level1) -{ - int32_t ret; - int32_t volumeLevel = 9; - ret = AudioPolicyManager::GetInstance().SetSystemVolumeLevel(AudioVolumeType::STREAM_NOTIFICATION, volumeLevel); - EXPECT_EQ(SUCCESS, ret); - ret = AudioPolicyManager::GetInstance().GetSystemVolumeLevel(AudioVolumeType::STREAM_NOTIFICATION); - EXPECT_EQ(volumeLevel, ret); -} - /** * @tc.name : Test GetStreamMute * @tc.number: GetStreamMute_001 diff --git a/services/audio_policy/client/service/src/audio_policy_manager.cpp b/services/audio_policy/client/service/src/audio_policy_manager.cpp index ac9bdab7e6..0d95849e1d 100644 --- a/services/audio_policy/client/service/src/audio_policy_manager.cpp +++ b/services/audio_policy/client/service/src/audio_policy_manager.cpp @@ -359,19 +359,6 @@ int32_t AudioPolicyManager::SetSystemVolumeLevel(AudioVolumeType volumeType, int return gsp->SetSystemVolumeLevel(volumeType, volumeLevel, volumeFlag, uid); } -int32_t AudioPolicyManager::SetSystemNotificationVolumeLevel(AudioVolumeType volumeType, int32_t volumeLevel, - bool isLegacy, int32_t volumeFlag, int32_t uid) -{ - const sptr gsp = GetAudioPolicyManagerProxy(); - CHECK_AND_RETURN_RET_LOG(gsp != nullptr, -1, "audio policy manager proxy is NULL."); - - volumeType = STREAM_RING; - if (isLegacy) { - return gsp->SetSystemVolumeLevelLegacy(volumeType, volumeLevel); - } - return gsp->SetSystemVolumeLevel(volumeType, volumeLevel, volumeFlag, uid); -} - int32_t AudioPolicyManager::SetSystemVolumeLevelWithDevice(AudioVolumeType volumeType, int32_t volumeLevel, DeviceType deviceType, int32_t volumeFlag) { @@ -513,17 +500,6 @@ int32_t AudioPolicyManager::GetSystemVolumeLevel(AudioVolumeType volumeType, int return volumeLevel; } -int32_t AudioPolicyManager::GetSystemNotificationVolumeLevel(AudioVolumeType volumeType, int32_t uid) -{ - const sptr gsp = GetAudioPolicyManagerProxy(); - CHECK_AND_RETURN_RET_LOG(gsp != nullptr, -1, "audio policy manager proxy is NULL."); - - volumeType = STREAM_RING; - int32_t volumeLevel = -1; - gsp->GetSystemVolumeLevel(volumeType, uid, volumeLevel); - return volumeLevel; -} - int32_t AudioPolicyManager::SetStreamMute(AudioVolumeType volumeType, bool mute, bool isLegacy, const DeviceType &deviceType) { diff --git a/services/audio_policy/test/unittest/audio_volume_manager_unit_test/src/audio_volume_manager_unit_test.cpp b/services/audio_policy/test/unittest/audio_volume_manager_unit_test/src/audio_volume_manager_unit_test.cpp index 7acc518340..d039642853 100644 --- a/services/audio_policy/test/unittest/audio_volume_manager_unit_test/src/audio_volume_manager_unit_test.cpp +++ b/services/audio_policy/test/unittest/audio_volume_manager_unit_test/src/audio_volume_manager_unit_test.cpp @@ -356,25 +356,6 @@ HWTEST_F(AudioVolumeManagerUnitTest, AudioVolumeManager_015, TestSize.Level1) EXPECT_EQ(audioVolumeManager.isBtFirstBoot_, true); } -/** -* @tc.name : Test AudioVolumeManager. -* @tc.number: GetSystemVolumeLevel_001 -* @tc.desc : Test GetSystemVolumeLevel interface. -*/ -HWTEST_F(AudioVolumeManagerUnitTest, GetSystemVolumeLevel_001, TestSize.Level1) -{ - AudioStreamType streamType = STREAM_NOTIFICATION; - int32_t safeVolume = 0; - AudioVolumeManager& audioVolumeManager(AudioVolumeManager::GetInstance()); - - audioVolumeManager.RestoreSafeVolume(streamType, safeVolume); - EXPECT_EQ(audioVolumeManager.GetSystemVolumeLevel(streamType), 0); - - safeVolume = -1; - audioVolumeManager.RestoreSafeVolume(streamType, safeVolume); - EXPECT_EQ(audioVolumeManager.GetSystemVolumeLevel(streamType), 0); -} - /** * @tc.name : Test AudioVolumeManager. * @tc.number: SetVolumeForSwitchDevice_001 diff --git a/services/audio_service/client/src/audio_group_manager.cpp b/services/audio_service/client/src/audio_group_manager.cpp index 73fa9d7192..768e1fa0fa 100644 --- a/services/audio_service/client/src/audio_group_manager.cpp +++ b/services/audio_service/client/src/audio_group_manager.cpp @@ -58,7 +58,6 @@ int32_t AudioGroupManager::SetVolume(AudioVolumeType volumeType, int32_t volume, case STREAM_VOICE_CALL: case STREAM_VOICE_COMMUNICATION: case STREAM_RING: - case STREAM_NOTIFICATION: case STREAM_MUSIC: case STREAM_ALARM: case STREAM_SYSTEM: @@ -76,11 +75,6 @@ int32_t AudioGroupManager::SetVolume(AudioVolumeType volumeType, int32_t volume, return ERR_NOT_SUPPORTED; } - if (volumeType == STREAM_NOTIFICATION) { - return AudioPolicyManager::GetInstance().SetSystemNotificationVolumeLevel( - volumeType, volume, false, volumeFlag, uid); - } - /* Call Audio Policy SetSystemVolumeLevel */ return AudioPolicyManager::GetInstance().SetSystemVolumeLevel(volumeType, volume, false, volumeFlag, uid); } @@ -127,10 +121,6 @@ int32_t AudioGroupManager::GetVolume(AudioVolumeType volumeType, int32_t uid) return ERR_NOT_SUPPORTED; } - if (volumeType == STREAM_NOTIFICATION) { - return AudioPolicyManager::GetInstance().GetSystemNotificationVolumeLevel(volumeType, uid); - } - return AudioPolicyManager::GetInstance().GetSystemVolumeLevel(volumeType, uid); } -- Gitee