diff --git a/frameworks/ans/core/common/include/ans_const_define.h b/frameworks/ans/core/common/include/ans_const_define.h index c498d2bcbb5992effdf8c4baf752db9731f724de..c06a85900bbebadf76ec919c092ba8312559b5cf 100644 --- a/frameworks/ans/core/common/include/ans_const_define.h +++ b/frameworks/ans/core/common/include/ans_const_define.h @@ -32,8 +32,11 @@ constexpr uint32_t MAX_ICON_SIZE = 50 * 1024; constexpr uint32_t MAX_PICTURE_SIZE = 2 * 1024 * 1024; constexpr bool SUPPORT_DO_NOT_DISTRUB = true; constexpr uint32_t SYSTEM_SERVICE_UID = 1000; + constexpr int32_t SUBSCRIBE_USER_INIT = -1; constexpr int32_t SUBSCRIBE_USER_ALL = -2; +constexpr int32_t SUBSCRIBE_USER_SYSTEM_BEGIN = 0; +constexpr int32_t SUBSCRIBE_USER_SYSTEM_END = 99 // Default sound for notification const static Uri DEFAULT_NOTIFICATION_SOUND("file://system/etc/Light.ogg"); diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp index f936f46553ba662424715fcf6f5afdd8c09056f6..81793035fcc07196a7375f1d007555d5958b8a22 100644 --- a/services/ans/src/advanced_notification_service.cpp +++ b/services/ans/src/advanced_notification_service.cpp @@ -161,6 +161,9 @@ inline ErrCode PrepereNotificationRequest(const sptr &reque int userId = SUBSCRIBE_USER_INIT; OHOS::AccountSA::OsAccountManager::GetOsAccountLocalIdFromUid(uid, userId); + if (record->userId >= SUBSCRIBE_USER_SYSTEM_BEGIN && record->userId < SUBSCRIBE_USER_SYSTEM_END) { + userId = SUBSCRIBE_USER_ALL; + } request->SetCreatorUserId(userId); ErrCode result = CheckPictureSize(request); diff --git a/services/ans/src/notification_subscriber_manager.cpp b/services/ans/src/notification_subscriber_manager.cpp index 8485bea32a471483fda9108bc3294b14994003cb..40563a68c16ade318647f5be992bfb736c7b9de9 100644 --- a/services/ans/src/notification_subscriber_manager.cpp +++ b/services/ans/src/notification_subscriber_manager.cpp @@ -206,7 +206,8 @@ void NotificationSubscriberManager::AddRecordInfo( record->subscribedAll = false; } record->userId = subscribeInfo->GetAppUserId(); - if (record->userId == SUBSCRIBE_USER_INIT) { + if (record->userId == SUBSCRIBE_USER_INIT || + (record->userId >= SUBSCRIBE_USER_SYSTEM_BEGIN && record->userId < SUBSCRIBE_USER_SYSTEM_END)) { // system user record->userId = SUBSCRIBE_USER_ALL; } } else { @@ -286,7 +287,9 @@ void NotificationSubscriberManager::NotifyConsumedInner( auto BundleNames = notification->GetBundleName(); auto iter = std::find(record->bundleList_.begin(), record->bundleList_.end(), BundleNames); if (!record->subscribedAll == (iter != record->bundleList_.end()) && - (notification->GetUserId() == record->userId || record->userId == SUBSCRIBE_USER_ALL)) { + (notification->GetUserId() == record->userId || + notification->GetUserId() == SUBSCRIBE_USER_ALL || + record->userId == SUBSCRIBE_USER_ALL)) { record->subscriber->OnConsumed(notification, notificationMap); record->subscriber->OnConsumed(notification); }