diff --git a/bundle.json b/bundle.json index 7e463c41c9b7090ec8a4783ed8a5e04eb9ab6347..5908c6c581511c9c1912a800c5e4b99ece9b05f0 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 a6f8a0a7dd69b7e349ec0c6a75a65560c8c3c915..87945431e989cd915df8b7d8b75598cc50f0e967 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 2a7d21546292b7615ba0c335e11336fc592c7551..14d418a507a8aa9335ae9b715f0f54ff638473f1 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 48a44fc3f0f64819121511f3f83787f0c5748b99..8cd69c98c57aca8c6bc1cdc1740c64f3cd2ac487 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 1e5617b372d5e30b2b2fb4d110c248ee23d8ff2d..8c373778e138f2885a15cc9da2d3c63a890e22ef 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 d4aade70ff2a1b62e8058719ebbcd45f3b475356..c92305f56ee96e9c902a8c775a5811095f680b1d 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 aaca24b7fa3816dc7ba0d9e7f35ecac1cc287007..86a06d8dd1894c43b0b56f8ac6b0f1c4bd8088d8 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 0b99bb6ede6cb98bf23d2cf9f039281872765d66..1e7611ce0ac04e1c4926e0b7497500c59d0cbb3e 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 faebf7e1871c78b78afec6740f436b71e6d2a81f..c2f4e20971b71016e3367153c2ab0ccce2727382 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" ] }