From d75511353d1526ee3efbca83845a2992ff37ac66 Mon Sep 17 00:00:00 2001
From: zhaoyuan17 <zhaoyuan17@huawei.com>
Date: Thu, 16 Dec 2021 17:03:56 +0000
Subject: [PATCH] Modify delete reason for Continuous Task

Signed-off-by: zhaoyuan17 <zhaoyuan17@huawei.com>
---
 .../ans/core/include/ans_manager_interface.h  |  4 +-
 frameworks/ans/core/src/ans_manager_proxy.cpp |  4 +-
 frameworks/ans/core/src/ans_manager_stub.cpp  |  4 +-
 .../test/moduletest/ans_fw_module_test.cpp    | 16 ++++----
 services/ans/include/disturb_filter.h         | 39 -------------------
 .../ans/src/advanced_notification_service.cpp |  2 +-
 6 files changed, 15 insertions(+), 54 deletions(-)
 delete mode 100644 services/ans/include/disturb_filter.h

diff --git a/frameworks/ans/core/include/ans_manager_interface.h b/frameworks/ans/core/include/ans_manager_interface.h
index fae8fdf3e..8513f4fc5 100644
--- a/frameworks/ans/core/include/ans_manager_interface.h
+++ b/frameworks/ans/core/include/ans_manager_interface.h
@@ -170,8 +170,8 @@ protected:
         CANCEL_GROUP,
         REMOVE_GROUP_BY_BUNDLE,
         SHELL_DUMP,
-        PUBLISH_LONG_TASK_NOTIFICATION,
-        CANCEL_LONG_TASK_NOTIFICATION,
+        PUBLISH_CONTINUOUS_TASK_NOTIFICATION,
+        CANCEL_CONTINUOUS_TASK_NOTIFICATION,
     };
 };
 }  // namespace Notification
diff --git a/frameworks/ans/core/src/ans_manager_proxy.cpp b/frameworks/ans/core/src/ans_manager_proxy.cpp
index f3889d70d..cdde8d21a 100644
--- a/frameworks/ans/core/src/ans_manager_proxy.cpp
+++ b/frameworks/ans/core/src/ans_manager_proxy.cpp
@@ -1894,7 +1894,7 @@ ErrCode AnsManagerProxy::PublishContinuousTaskNotification(const sptr<Notificati
 
     MessageParcel reply;
     MessageOption option = {MessageOption::TF_SYNC};
-    ErrCode result = InnerTransact(PUBLISH_LONG_TASK_NOTIFICATION, option, data, reply);
+    ErrCode result = InnerTransact(PUBLISH_CONTINUOUS_TASK_NOTIFICATION, option, data, reply);
     if (result != ERR_OK) {
         ANS_LOGW("[PublishContinuousTaskNotification] fail: transact ErrCode=%{public}d", result);
         return ERR_ANS_TRANSACT_FAILED;
@@ -1927,7 +1927,7 @@ ErrCode AnsManagerProxy::CancelContinuousTaskNotification(const std::string &lab
     }
     MessageParcel reply;
     MessageOption option = {MessageOption::TF_SYNC};
-    ErrCode result = InnerTransact(CANCEL_LONG_TASK_NOTIFICATION, option, data, reply);
+    ErrCode result = InnerTransact(CANCEL_CONTINUOUS_TASK_NOTIFICATION, option, data, reply);
     if (result != ERR_OK) {
         ANS_LOGW("[CancelContinuousTaskNotification] fail: transact ErrCode=%{public}d", result);
         return ERR_ANS_TRANSACT_FAILED;
diff --git a/frameworks/ans/core/src/ans_manager_stub.cpp b/frameworks/ans/core/src/ans_manager_stub.cpp
index ea74077f4..9d3549f3b 100644
--- a/frameworks/ans/core/src/ans_manager_stub.cpp
+++ b/frameworks/ans/core/src/ans_manager_stub.cpp
@@ -187,11 +187,11 @@ const std::map<uint32_t, std::function<ErrCode(AnsManagerStub *, MessageParcel &
         {AnsManagerStub::SHELL_DUMP,
             std::bind(
                 &AnsManagerStub::HandleShellDump, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3)},
-        {AnsManagerStub::PUBLISH_LONG_TASK_NOTIFICATION,
+        {AnsManagerStub::PUBLISH_CONTINUOUS_TASK_NOTIFICATION,
             std::bind(
                 &AnsManagerStub::HandlePublishContinuousTaskNotification, std::placeholders::_1, std::placeholders::_2,
                 std::placeholders::_3)},
-        {AnsManagerStub::CANCEL_LONG_TASK_NOTIFICATION,
+        {AnsManagerStub::CANCEL_CONTINUOUS_TASK_NOTIFICATION,
             std::bind(
                 &AnsManagerStub::HandleCancelContinuousTaskNotification, std::placeholders::_1, std::placeholders::_2,
                 std::placeholders::_3)},
diff --git a/frameworks/ans/test/moduletest/ans_fw_module_test.cpp b/frameworks/ans/test/moduletest/ans_fw_module_test.cpp
index aeed6929a..741f7d59f 100644
--- a/frameworks/ans/test/moduletest/ans_fw_module_test.cpp
+++ b/frameworks/ans/test/moduletest/ans_fw_module_test.cpp
@@ -1546,7 +1546,7 @@ HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_DoNotDisturb_07000, Function | Medium
     EXPECT_EQ(srcDate.GetDoNotDisturbType(), disDate.GetDoNotDisturbType());
 }
 
-HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07100, Function | MediumTest | Level1)
+HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishContinuousTask_07100, Function | MediumTest | Level1)
 {
     IPCSkeleton::SetCallingUid(SYSTEM_SERVICE_UID);
     TestAnsSubscriber subscriber;
@@ -1581,7 +1581,7 @@ HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07100, Function | Med
     IPCSkeleton::SetCallingUid(1);
 }
 
-HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07200, Function | MediumTest | Level1)
+HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishContinuousTask_07200, Function | MediumTest | Level1)
 {
     IPCSkeleton::SetCallingUid(SYSTEM_SERVICE_UID);
     TestAnsSubscriber subscriber;
@@ -1618,7 +1618,7 @@ HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07200, Function | Med
     IPCSkeleton::SetCallingUid(1);
 }
 
-HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07300, Function | MediumTest | Level1)
+HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishContinuousTask_07300, Function | MediumTest | Level1)
 {
     IPCSkeleton::SetCallingUid(SYSTEM_SERVICE_UID);
     TestAnsSubscriber subscriber;
@@ -1654,14 +1654,14 @@ HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07300, Function | Med
     IPCSkeleton::SetCallingUid(1);
 }
 
-HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07400, Function | MediumTest | Level1)
+HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishContinuousTask_07400, Function | MediumTest | Level1)
 {
     NotificationRequest req(0);
     req.SetLabel(NOTIFICATION_LABEL_0);
     EXPECT_EQ(NotificationHelper::PublishContinuousTaskNotification(req), (int)ERR_ANS_NOT_SYSTEM_SERVICE);
 }
 
-HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07500, Function | MediumTest | Level1)
+HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishContinuousTask_07500, Function | MediumTest | Level1)
 {
     TestAnsSubscriber subscriber;
     NotificationSubscribeInfo info;
@@ -1697,7 +1697,7 @@ HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07500, Function | Med
     SleepForFC();
 }
 
-HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07600, Function | MediumTest | Level1)
+HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishContinuousTask_07600, Function | MediumTest | Level1)
 {
     IPCSkeleton::SetCallingUid(SYSTEM_SERVICE_UID);
     TestAnsSubscriber subscriber;
@@ -1724,7 +1724,7 @@ HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07600, Function | Med
     IPCSkeleton::SetCallingUid(1);
 }
 
-HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07700, Function | MediumTest | Level1)
+HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishContinuousTask_07700, Function | MediumTest | Level1)
 {
     IPCSkeleton::SetCallingUid(SYSTEM_SERVICE_UID);
     TestAnsSubscriber subscriber;
@@ -1762,7 +1762,7 @@ HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07700, Function | Med
     IPCSkeleton::SetCallingUid(1);
 }
 
-HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishLongTask_07800, Function | MediumTest | Level1)
+HWTEST_F(AnsFWModuleTest, ANS_Interface_MT_PulbishContinuousTask_07800, Function | MediumTest | Level1)
 {
     IPCSkeleton::SetCallingUid(SYSTEM_SERVICE_UID);
     TestAnsSubscriber subscriber;
diff --git a/services/ans/include/disturb_filter.h b/services/ans/include/disturb_filter.h
deleted file mode 100644
index 84c4846bb..000000000
--- a/services/ans/include/disturb_filter.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef BASE_NOTIFICATION_ANS_STANDARD_SERVICES_ANS_INCLUDE_DISTURB_FILTER_H
-#define BASE_NOTIFICATION_ANS_STANDARD_SERVICES_ANS_INCLUDE_DISTURB_FILTER_H
-
-#include "notification_filter.h"
-
-namespace OHOS {
-namespace Notification {
-class DisturbFilter : public INotificationFilter {
-public:
-    DisturbFilter() {};
-    ~DisturbFilter() {};
-
-    void OnStart() override;
-    void OnStop() override;
-
-    ErrCode OnPublish(const std::shared_ptr<NotificationRecord> &record) override;
-
-private:
-    void GetTimeInterval(int64_t &beginDate, int64_t &endDate);
-};
-}  // namespace Notification
-}  // namespace OHOS
-
-#endif  // BASE_NOTIFICATION_ANS_STANDARD_SERVICES_ANS_INCLUDE_DISTURB_FILTER_H
\ No newline at end of file
diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp
index 1af9f6629..c0995fcd1 100644
--- a/services/ans/src/advanced_notification_service.cpp
+++ b/services/ans/src/advanced_notification_service.cpp
@@ -1367,7 +1367,7 @@ ErrCode AdvancedNotificationService::CancelContinuousTaskNotification(const std:
             }
         }
         if (notification != nullptr) {
-            int reason = NotificationConstant::CANCEL_REASON_DELETE;
+            int reason = NotificationConstant::APP_CANCEL_REASON_DELETE;
             UpdateRecentNotification(notification, true, reason);
             sptr<NotificationSortingMap> sortingMap = GenerateSortingMap();
             NotificationSubscriberManager::GetInstance()->NotifyCanceled(notification, sortingMap, reason);
-- 
Gitee