From bd1cf7ae987cdd683201a92dca5ef9b6f1c07e27 Mon Sep 17 00:00:00 2001
From: sunjiakun <sunjiakun5@huawei.com>
Date: Mon, 6 Jan 2025 11:30:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E5=B8=83=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E7=AE=A1=E6=8E=A7=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: sunjiakun <sunjiakun5@huawei.com>
---
 services/ans/include/advanced_notification_service.h       | 1 +
 services/ans/src/advanced_notification_publish_service.cpp | 1 -
 services/ans/src/advanced_notification_service.cpp         | 3 ++-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/ans/include/advanced_notification_service.h b/services/ans/include/advanced_notification_service.h
index 1ecf0da7d..0430bbe68 100644
--- a/services/ans/include/advanced_notification_service.h
+++ b/services/ans/include/advanced_notification_service.h
@@ -54,6 +54,7 @@ namespace OHOS {
 namespace Notification {
 
 static const uint32_t DEFAULT_SLOT_FLAGS = 59; // 0b111011
+constexpr int32_t ANS_UID = 5523;
 class AdvancedNotificationService final : public AnsManagerStub,
     public std::enable_shared_from_this<AdvancedNotificationService> {
 public:
diff --git a/services/ans/src/advanced_notification_publish_service.cpp b/services/ans/src/advanced_notification_publish_service.cpp
index afdf72bf3..d966fae27 100644
--- a/services/ans/src/advanced_notification_publish_service.cpp
+++ b/services/ans/src/advanced_notification_publish_service.cpp
@@ -64,7 +64,6 @@ constexpr uint32_t SECONDS_IN_ONE_DAY = 24 * 60 * 60;
 const static std::string NOTIFICATION_EVENT_PUSH_AGENT = "notification.event.PUSH_AGENT";
 const static std::string NOTIFICATION_EVENT_SUBSCRIBER_STATUS = "notification.event.SUBSCRIBER_STATUS";
 constexpr int32_t RSS_PID = 3051;
-constexpr int32_t ANS_UID = 5523;
 constexpr int32_t TYPE_CODE_DOWNLOAD = 8;
 constexpr const char *FOCUS_MODE_REPEAT_CALLERS_ENABLE = "1";
 constexpr const char *CONTACT_DATA = "datashare:///com.ohos.contactsdataability/contacts/contact_data?Proxy=true";
diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp
index 6c153c912..a185f82c0 100644
--- a/services/ans/src/advanced_notification_service.cpp
+++ b/services/ans/src/advanced_notification_service.cpp
@@ -2335,7 +2335,8 @@ ErrCode AdvancedNotificationService::DisableNotificationFeature(const sptr<Notif
         ANS_LOGE("notificationDisable is no system app");
         return ERR_ANS_NON_SYSTEM_APP;
     }
-    if (!AccessTokenHelper::CheckPermission(OHOS_PERMISSION_NOTIFICATION_CONTROLLER)) {
+    int32_t callingUid = IPCSkeleton::GetCallingUid();
+    if (callingUid != ANS_UID && !AccessTokenHelper::CheckPermission(OHOS_PERMISSION_NOTIFICATION_CONTROLLER)) {
         ANS_LOGE("notificationDisable is permission denied");
         return ERR_ANS_PERMISSION_DENIED;
     }
-- 
Gitee