diff --git a/frameworks/js/napi/src/common_convert_content.cpp b/frameworks/js/napi/src/common_convert_content.cpp index fed18c51997426b26aca558dc95523d4be7802db..e77e49c6fc1687b9ec631ce1261ac36923372675 100644 --- a/frameworks/js/napi/src/common_convert_content.cpp +++ b/frameworks/js/napi/src/common_convert_content.cpp @@ -573,6 +573,8 @@ napi_value Common::GetNotificationBasicContentDetailed( NAPI_CALL(env, napi_get_value_string_utf8(env, value, shortStr, SHORT_TEXT_SIZE - 1, &strLen)); if (std::strlen(shortStr) == 0) { ANS_LOGE("Property title is empty"); + std::string msg = "Incorrect parameter. Property title is empty."; + Common::NapiThrow(env, ERROR_PARAM_INVALID, msg); return nullptr; } basicContent->SetTitle(shortStr); @@ -589,6 +591,8 @@ napi_value Common::GetNotificationBasicContentDetailed( NAPI_CALL(env, napi_get_value_string_utf8(env, value, commonStr, COMMON_TEXT_SIZE - 1, &strLen)); if (std::strlen(commonStr) == 0) { ANS_LOGE("Property text is empty"); + std::string msg = "Incorrect parameter. Property text is empty"; + Common::NapiThrow(env, ERROR_PARAM_INVALID, msg); return nullptr; } basicContent->SetText(commonStr); diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp index 7725de69a9ed8c3f41971b639ae03744382873ec..336c43cc3b59d7b5ef4ffdc7c542b3d948219aac 100644 --- a/services/ans/src/advanced_notification_service.cpp +++ b/services/ans/src/advanced_notification_service.cpp @@ -753,9 +753,7 @@ ErrCode AdvancedNotificationService::PublishPreparedNotification(const sptrGetBadgeNumber() > 0) { - NotificationAnalyticsUtil::ReportPublishBadge(request); - } + NotificationAnalyticsUtil::ReportPublishBadge(request); })); notificationSvrQueue_->wait(handler); // live view handled in UpdateNotificationTimerInfo, ignore here. diff --git a/services/ans/src/common/notification_analytics_util.cpp b/services/ans/src/common/notification_analytics_util.cpp index 2378d03c91e2a58f87803fdb62ef5b08ac970b6d..b3c6511043f5d49379f9b07ac146f7f1ffb8ce37 100644 --- a/services/ans/src/common/notification_analytics_util.cpp +++ b/services/ans/src/common/notification_analytics_util.cpp @@ -764,6 +764,9 @@ void NotificationAnalyticsUtil::ReportPublishBadge(const sptrGetBadgeNumber() <= 0) { + return; + } BadgeInfo badgeInfo; auto now = std::chrono::duration_cast( std::chrono::system_clock::now().time_since_epoch()).count(); diff --git a/services/ans/src/permission_filter.cpp b/services/ans/src/permission_filter.cpp index 00207a553e0a790b1ad7593fde8d9c92766a689c..9726c31932b6bdab11e2e34ce7e4827107fed0d4 100644 --- a/services/ans/src/permission_filter.cpp +++ b/services/ans/src/permission_filter.cpp @@ -69,7 +69,7 @@ ErrCode PermissionFilter::OnPublish(const std::shared_ptr &r if (result == ERR_ANS_PREFERENCES_NOTIFICATION_SLOT_TYPE_NOT_EXIST) { message.ErrorCode(ERR_ANS_PREFERENCES_NOTIFICATION_SLOT_TYPE_NOT_EXIST).Message("Slot type not exist."); NotificationAnalyticsUtil::ReportPublishFailedEvent(record->request, message); - ANS_LOGE("Slot type not exist."); + ANS_LOGE("Slot type %{public}d not exist.", slotType); } }