From 10153cc70506c091c0714ec2b5d4acae6b5db709 Mon Sep 17 00:00:00 2001 From: songbao1 Date: Tue, 3 Jun 2025 16:50:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=91=98=E8=A6=81=E7=89=B9?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: songbao1 --- bundle.json | 1 - services/ans/BUILD.gn | 3 +-- services/ans/test/unittest/BUILD.gn | 3 +-- .../advancednotificationservice/servicepublish_fuzzer/BUILD.gn | 3 +-- test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn | 3 +-- test/fuzztest/ansmanagerstub_fuzzer/BUILD.gn | 3 +-- test/fuzztest/ansmanagerstubannex_fuzzer/BUILD.gn | 3 +-- test/fuzztest/ansmanagerstubannexthree_fuzzer/BUILD.gn | 3 +-- test/fuzztest/ansmanagerstubannextwo_fuzzer/BUILD.gn | 3 +-- 9 files changed, 8 insertions(+), 17 deletions(-) diff --git a/bundle.json b/bundle.json index 7e463c41c..5908c6c58 100644 --- a/bundle.json +++ b/bundle.json @@ -44,7 +44,6 @@ "SystemCapability.Notification.NotificationSettings" ], "features": [ - "distributed_notification_service_feature_summary", "distributed_notification_service_feature_additional_control", "distributed_notification_service_feature_disable_fa_model", "distributed_notification_service_feature_privileged_message", diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn index a6f8a0a7d..87945431e 100644 --- a/services/ans/BUILD.gn +++ b/services/ans/BUILD.gn @@ -231,8 +231,7 @@ ohos_source_set("ans_service_sources") { defines += [ "SCREENLOCK_MGR_ENABLE" ] } - if (distributed_notification_service_feature_summary || - distributed_notification_service_feature_additional_control || + if (distributed_notification_service_feature_additional_control || distributed_notification_service_feature_privileged_message) { defines += [ "ENABLE_ANS_EXT_WRAPPER" ] } diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn index 2a7d21546..14d418a50 100644 --- a/services/ans/test/unittest/BUILD.gn +++ b/services/ans/test/unittest/BUILD.gn @@ -1371,8 +1371,7 @@ ohos_unittest("notification_extension_wrapper_unit_test") { "hilog:libhilog", ] - if (distributed_notification_service_feature_summary || - distributed_notification_service_feature_additional_control || + if (distributed_notification_service_feature_additional_control || distributed_notification_service_feature_privileged_message) { defines += [ "ENABLE_ANS_EXT_WRAPPER" ] } diff --git a/test/fuzztest/advancednotificationservice/servicepublish_fuzzer/BUILD.gn b/test/fuzztest/advancednotificationservice/servicepublish_fuzzer/BUILD.gn index 48a44fc3f..8cd69c98c 100644 --- a/test/fuzztest/advancednotificationservice/servicepublish_fuzzer/BUILD.gn +++ b/test/fuzztest/advancednotificationservice/servicepublish_fuzzer/BUILD.gn @@ -122,8 +122,7 @@ ohos_fuzztest("ServicePublishFuzzTest") { defines += [ "SCREENLOCK_MGR_ENABLE" ] } - if (distributed_notification_service_feature_summary || - distributed_notification_service_feature_additional_control || + if (distributed_notification_service_feature_additional_control || distributed_notification_service_feature_privileged_message) { defines += [ "ENABLE_ANS_EXT_WRAPPER" ] } diff --git a/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn b/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn index 1e5617b37..8c373778e 100644 --- a/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn +++ b/test/fuzztest/advancednotificationservice_fuzzer/BUILD.gn @@ -124,8 +124,7 @@ ohos_fuzztest("AdvancedNotificationServiceFuzzTest") { defines += [ "SCREENLOCK_MGR_ENABLE" ] } - if (distributed_notification_service_feature_summary || - distributed_notification_service_feature_additional_control) { + if (distributed_notification_service_feature_additional_control) { defines += [ "ENABLE_ANS_EXT_WRAPPER" ] } diff --git a/test/fuzztest/ansmanagerstub_fuzzer/BUILD.gn b/test/fuzztest/ansmanagerstub_fuzzer/BUILD.gn index d4aade70f..c92305f56 100644 --- a/test/fuzztest/ansmanagerstub_fuzzer/BUILD.gn +++ b/test/fuzztest/ansmanagerstub_fuzzer/BUILD.gn @@ -87,8 +87,7 @@ ohos_fuzztest("AnsManagerStubFuzzTest") { defines += [ "SCREENLOCK_MGR_ENABLE" ] } - if (distributed_notification_service_feature_summary || - distributed_notification_service_feature_additional_control) { + if (distributed_notification_service_feature_additional_control) { defines += [ "ENABLE_ANS_EXT_WRAPPER" ] } diff --git a/test/fuzztest/ansmanagerstubannex_fuzzer/BUILD.gn b/test/fuzztest/ansmanagerstubannex_fuzzer/BUILD.gn index aaca24b7f..86a06d8dd 100644 --- a/test/fuzztest/ansmanagerstubannex_fuzzer/BUILD.gn +++ b/test/fuzztest/ansmanagerstubannex_fuzzer/BUILD.gn @@ -89,8 +89,7 @@ ohos_fuzztest("AnsManagerStubAnnexFuzzTest") { defines += [ "SCREENLOCK_MGR_ENABLE" ] } - if (distributed_notification_service_feature_summary || - distributed_notification_service_feature_additional_control) { + if (distributed_notification_service_feature_additional_control) { defines += [ "ENABLE_ANS_EXT_WRAPPER" ] } diff --git a/test/fuzztest/ansmanagerstubannexthree_fuzzer/BUILD.gn b/test/fuzztest/ansmanagerstubannexthree_fuzzer/BUILD.gn index 0b99bb6ed..1e7611ce0 100644 --- a/test/fuzztest/ansmanagerstubannexthree_fuzzer/BUILD.gn +++ b/test/fuzztest/ansmanagerstubannexthree_fuzzer/BUILD.gn @@ -90,8 +90,7 @@ ohos_fuzztest("AnsManagerStubAnnexThreeFuzzTest") { defines += [ "SCREENLOCK_MGR_ENABLE" ] } - if (distributed_notification_service_feature_summary || - distributed_notification_service_feature_additional_control) { + if (distributed_notification_service_feature_additional_control) { defines += [ "ENABLE_ANS_EXT_WRAPPER" ] } diff --git a/test/fuzztest/ansmanagerstubannextwo_fuzzer/BUILD.gn b/test/fuzztest/ansmanagerstubannextwo_fuzzer/BUILD.gn index faebf7e18..c2f4e2097 100644 --- a/test/fuzztest/ansmanagerstubannextwo_fuzzer/BUILD.gn +++ b/test/fuzztest/ansmanagerstubannextwo_fuzzer/BUILD.gn @@ -90,8 +90,7 @@ ohos_fuzztest("AnsManagerStubAnnexTwoFuzzTest") { defines += [ "SCREENLOCK_MGR_ENABLE" ] } - if (distributed_notification_service_feature_summary || - distributed_notification_service_feature_additional_control) { + if (distributed_notification_service_feature_additional_control) { defines += [ "ENABLE_ANS_EXT_WRAPPER" ] } -- Gitee