From 5ee931f3eaa663485ae260ca3f3b8712972fe181 Mon Sep 17 00:00:00 2001
From: songbao1 <luojingsong@h-partners.com>
Date: Thu, 26 Sep 2024 09:47:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=95=86=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: songbao1 <luojingsong@h-partners.com>
---
 services/ans/src/advanced_notification_live_view_service.cpp | 5 -----
 services/ans/src/advanced_notification_publish_service.cpp   | 5 -----
 services/ans/src/advanced_notification_service.cpp           | 5 -----
 services/ans/src/notification_preferences_database.cpp       | 4 ++--
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/services/ans/src/advanced_notification_live_view_service.cpp b/services/ans/src/advanced_notification_live_view_service.cpp
index ed39e55e2..3cfc334e6 100644
--- a/services/ans/src/advanced_notification_live_view_service.cpp
+++ b/services/ans/src/advanced_notification_live_view_service.cpp
@@ -68,11 +68,6 @@ void AdvancedNotificationService::RecoverLiveViewFromDb(int32_t userId)
             continue;
         }
 
-        if (FlowControl(record) != ERR_OK) {
-            ANS_LOGE("Flow control failed.");
-            continue;
-        }
-
         // Turn off ringtone and vibration during recovery process
         auto notificationFlags = record->request->GetFlags();
         notificationFlags->SetSoundEnabled(NotificationConstant::FlagStatus::CLOSE);
diff --git a/services/ans/src/advanced_notification_publish_service.cpp b/services/ans/src/advanced_notification_publish_service.cpp
index c7bac3a21..27eaddec5 100644
--- a/services/ans/src/advanced_notification_publish_service.cpp
+++ b/services/ans/src/advanced_notification_publish_service.cpp
@@ -2035,11 +2035,6 @@ ErrCode AdvancedNotificationService::PublishNotificationBySa(const sptr<Notifica
     }
     SetRequestBySlotType(record->request, bundleOption);
 
-    result = FlowControl(record);
-    if (result != ERR_OK) {
-        return result;
-    }
-
 #ifdef ENABLE_ANS_EXT_WRAPPER
     EXTENTION_WRAPPER->GetUnifiedGroupInfo(request);
 #endif
diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp
index f9872f96c..bc11ca832 100644
--- a/services/ans/src/advanced_notification_service.cpp
+++ b/services/ans/src/advanced_notification_service.cpp
@@ -595,11 +595,6 @@ ErrCode AdvancedNotificationService::PublishPreparedNotification(const sptr<Noti
         return result;
     }
 
-    result = FlowControl(record);
-    if (result != ERR_OK) {
-        return result;
-    }
-
 #ifdef ENABLE_ANS_EXT_WRAPPER
     EXTENTION_WRAPPER->GetUnifiedGroupInfo(request);
 #endif
diff --git a/services/ans/src/notification_preferences_database.cpp b/services/ans/src/notification_preferences_database.cpp
index d517f469c..79b081669 100644
--- a/services/ans/src/notification_preferences_database.cpp
+++ b/services/ans/src/notification_preferences_database.cpp
@@ -1177,7 +1177,7 @@ int32_t NotificationPreferencesDatabase::StringToInt(const std::string &str) con
 {
     int32_t value = 0;
     if (!str.empty()) {
-        value = stoi(str, nullptr);
+        value = atoi(str.c_str());
     }
     return value;
 }
@@ -1186,7 +1186,7 @@ int64_t NotificationPreferencesDatabase::StringToInt64(const std::string &str) c
 {
     int64_t value = 0;
     if (!str.empty()) {
-        value = stoll(str, nullptr);
+        value = atoll(str.c_str());
     }
     return value;
 }
-- 
Gitee