From ca4998cadc3337792cdf527b3ade27c257d8e9e1 Mon Sep 17 00:00:00 2001
From: liuyanzhi <liuyanzhi3@huawei.com>
Date: Mon, 14 Mar 2022 11:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: liuyanzhi <liuyanzhi3@huawei.com>
Change-Id: I1914ddf0df069014c5cb835c97e9eccea674d4b3
---
 OAT.xml                                                |  4 +---
 frameworks/ans/core/common/src/ans_log_wrapper.cpp     |  5 +----
 .../ans/core/src/ans_manager_death_recipient.cpp       |  2 +-
 .../ans/dialog/dialog_ui/js/pages/index/index.css      |  2 +-
 .../ans/dialog/dialog_ui/js/pages/index/index.hml      |  2 +-
 frameworks/ans/native/src/notification_user_input.cpp  |  4 ++--
 frameworks/ans/test/moduletest/ans_fw_module_test.cpp  | 10 ++++++----
 .../kits/napi/ans/src/reminder/reminder_common.cpp     |  2 +-
 services/ans/src/bundle_manager_helper.cpp             |  2 +-
 services/ans/src/notification_preferences_info.cpp     |  4 +++-
 services/ans/src/notification_subscriber_manager.cpp   |  2 +-
 services/distributed/src/distributed_preferences.cpp   |  6 ++++--
 services/distributed/test/unittest/BUILD.gn            |  2 +-
 .../notificationfuzztest/src/notificationgetparam.cpp  | 10 +---------
 tools/dump/src/notification_shell_command.cpp          |  2 +-
 15 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/OAT.xml b/OAT.xml
index aa01ceabe..78d612129 100644
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2021 Huawei Device Co., Ltd.
+<!-- Copyright (c) 2021-2022 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.
@@ -13,8 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 
-     Notes:
-     This is project config file for OpenHarmony OSS Audit Tool, if you have any questions or concerns, please email chenyaxun@huawei.com.
 -->
 <!-- OAT(OSS Audit Tool) configuration guide:
 basedir: Root dir, the basedir + project path is the real source file location.
diff --git a/frameworks/ans/core/common/src/ans_log_wrapper.cpp b/frameworks/ans/core/common/src/ans_log_wrapper.cpp
index dc568d400..417eab5d6 100644
--- a/frameworks/ans/core/common/src/ans_log_wrapper.cpp
+++ b/frameworks/ans/core/common/src/ans_log_wrapper.cpp
@@ -21,10 +21,7 @@ AnsLogLevel AnsLogWrapper::level_ = {AnsLogLevel::DEBUG};
 bool AnsLogWrapper::JudgeLevel(const AnsLogLevel &level)
 {
     const AnsLogLevel &curLevel = AnsLogWrapper::GetLogLevel();
-    if (level < curLevel) {
-        return false;
-    }
-    return true;
+    return (level >= curLevel);
 }
 
 std::string AnsLogWrapper::GetBriefFileName(const char *str)
diff --git a/frameworks/ans/core/src/ans_manager_death_recipient.cpp b/frameworks/ans/core/src/ans_manager_death_recipient.cpp
index 07d648bff..eaf6498b4 100644
--- a/frameworks/ans/core/src/ans_manager_death_recipient.cpp
+++ b/frameworks/ans/core/src/ans_manager_death_recipient.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.css b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.css
index 7afe50dcd..950ed5b67 100644
--- a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.css
+++ b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.css
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
index 73e8c517a..e1ec0ff57 100644
--- a/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
+++ b/frameworks/ans/dialog/dialog_ui/js/pages/index/index.hml
@@ -1,5 +1,5 @@
 <!--  
-    Copyright (c) 2022 Huawei Device Co., Ltd.
+    Copyright (c) 2021-2022 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
diff --git a/frameworks/ans/native/src/notification_user_input.cpp b/frameworks/ans/native/src/notification_user_input.cpp
index 337eeb50c..dfd11abb9 100644
--- a/frameworks/ans/native/src/notification_user_input.cpp
+++ b/frameworks/ans/native/src/notification_user_input.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -248,7 +248,7 @@ bool NotificationUserInput::ToJson(nlohmann::json &jsonObject) const
 
 NotificationUserInput *NotificationUserInput::FromJson(const nlohmann::json &jsonObject)
 {
-    if (jsonObject.is_null() or !jsonObject.is_object()) {
+    if (jsonObject.is_null() || !jsonObject.is_object()) {
         ANS_LOGE("Invalid JSON object");
         return nullptr;
     }
diff --git a/frameworks/ans/test/moduletest/ans_fw_module_test.cpp b/frameworks/ans/test/moduletest/ans_fw_module_test.cpp
index e5fec4ec0..e6763424d 100644
--- a/frameworks/ans/test/moduletest/ans_fw_module_test.cpp
+++ b/frameworks/ans/test/moduletest/ans_fw_module_test.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -444,9 +444,11 @@ public:
         DistributedKv::StoreId storeId = {.storeId = KVSTORE_SCREEN_STATUS_STORE_ID};
         std::shared_ptr<DistributedKv::AnsTestSingleKvStore> pointer =
             DistributedKv::AnsTestSingleKvStore::GetMockKvStorePointer(appId, storeId);
-        DistributedKv::Key key("<remoteDeviceId>" + DELIMITER + "screen_status");
-        DistributedKv::Value value(isScreenOn ? "on" : "off");
-        pointer->Put(key, value);
+        if (pointer) {
+            DistributedKv::Key key("<remoteDeviceId>" + DELIMITER + "screen_status");
+            DistributedKv::Value value(isScreenOn ? "on" : "off");
+            pointer->Put(key, value);
+        }
     }
 };
 
diff --git a/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp b/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp
index 5f4ada3ae..746a31c4f 100644
--- a/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp
+++ b/interfaces/kits/napi/ans/src/reminder/reminder_common.cpp
@@ -461,7 +461,7 @@ bool ReminderCommon::CheckCalendarParams(const int32_t &year, const int32_t &mon
             ReminderAgentNapi::CALENDAR_YEAR, UINT16_MAX);
         return false;
     }
-    if ((month < 1) || (month > (ReminderRequestCalendar::MAX_MONTHS_OF_YEAR))) {
+    if ((month < 1) || (month > ReminderRequestCalendar::MAX_MONTHS_OF_YEAR)) {
         ANSR_LOGW("Create calendar reminder fail: designated %{public}s must between [1, %{public}hhu]",
             ReminderAgentNapi::CALENDAR_MONTH, ReminderRequestCalendar::MAX_MONTHS_OF_YEAR);
         return false;
diff --git a/services/ans/src/bundle_manager_helper.cpp b/services/ans/src/bundle_manager_helper.cpp
index 9e965edcb..fa16f96a1 100644
--- a/services/ans/src/bundle_manager_helper.cpp
+++ b/services/ans/src/bundle_manager_helper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
diff --git a/services/ans/src/notification_preferences_info.cpp b/services/ans/src/notification_preferences_info.cpp
index 6d8e53d3b..ce0708be9 100644
--- a/services/ans/src/notification_preferences_info.cpp
+++ b/services/ans/src/notification_preferences_info.cpp
@@ -152,7 +152,9 @@ bool NotificationPreferencesInfo::BundleInfo::GetAllSlotsInGroup(
 
 void NotificationPreferencesInfo::BundleInfo::SetGroup(const sptr<NotificationSlotGroup> &group)
 {
-    groups_.insert_or_assign(group->GetId(), group);
+    if (group) {
+        groups_.insert_or_assign(group->GetId(), group);
+    }
 }
 
 bool NotificationPreferencesInfo::BundleInfo::GetGroup(const std::string &groupId, sptr<NotificationSlotGroup> &group)
diff --git a/services/ans/src/notification_subscriber_manager.cpp b/services/ans/src/notification_subscriber_manager.cpp
index 76868a8c1..c5bfe0446 100644
--- a/services/ans/src/notification_subscriber_manager.cpp
+++ b/services/ans/src/notification_subscriber_manager.cpp
@@ -77,7 +77,7 @@ ErrCode NotificationSubscriberManager::AddSubscriber(
         ANS_LOGD("Get userId successed, callingUid = <%{public}d> userId = <%{public}d>", callingUid, userId);
         subInfo->AddAppUserId(userId);
     }
-
+    
     ErrCode result = ERR_ANS_TASK_ERR;
     handler_->PostSyncTask(std::bind([this, &subscriber, &subInfo, &result]() {
         result = this->AddSubscriberInner(subscriber, subInfo);
diff --git a/services/distributed/src/distributed_preferences.cpp b/services/distributed/src/distributed_preferences.cpp
index 551fb0f1c..76564a1e2 100644
--- a/services/distributed/src/distributed_preferences.cpp
+++ b/services/distributed/src/distributed_preferences.cpp
@@ -78,8 +78,10 @@ void DistributedPreferences::GetDistributedMainKey(std::string &key)
 void DistributedPreferences::GetDistributedBundleKey(
     const sptr<NotificationBundleOption> &bundleOption, std::string &key)
 {
-    key = DISTRIBUTED_LABEL + DELIMITER + BUNDLE_LABEL + DELIMITER + bundleOption->GetBundleName() + DELIMITER +
-          std::to_string(bundleOption->GetUid());
+    if (bundleOption) {
+        key = DISTRIBUTED_LABEL + DELIMITER + BUNDLE_LABEL + DELIMITER + bundleOption->GetBundleName() + DELIMITER +
+            std::to_string(bundleOption->GetUid());
+    }
 }
 
 bool DistributedPreferences::ResolveDistributedKey(const std::string &key, ResolveKey &resolveKey)
diff --git a/services/distributed/test/unittest/BUILD.gn b/services/distributed/test/unittest/BUILD.gn
index 0f1d53cc6..a44b608ea 100644
--- a/services/distributed/test/unittest/BUILD.gn
+++ b/services/distributed/test/unittest/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021-2022 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
diff --git a/test/resource/notificationfuzztest/src/notificationgetparam.cpp b/test/resource/notificationfuzztest/src/notificationgetparam.cpp
index 99c54eae6..0006499c1 100644
--- a/test/resource/notificationfuzztest/src/notificationgetparam.cpp
+++ b/test/resource/notificationfuzztest/src/notificationgetparam.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
@@ -971,16 +971,12 @@ OHOS::Notification::NotificationConstant::SubscribeResult GetParamSubscribeResul
     switch (GetIntParam() % INDEX_THREE) {
         case INDEX_ZERO:
             return OHOS::Notification::NotificationConstant::SubscribeResult::SUCCESS;
-            break;
         case INDEX_ONE:
             return OHOS::Notification::NotificationConstant::SubscribeResult::PREMISSION_FAIL;
-            break;
         case INDEX_TWO:
             return OHOS::Notification::NotificationConstant::SubscribeResult::RESOURCES_FAIL;
-            break;
         default:
             return OHOS::Notification::NotificationConstant::SubscribeResult::SUCCESS;
-            break;
     }
 }
 
@@ -1005,16 +1001,12 @@ std::shared_ptr<OHOS::AppExecFwk::BaseTaskDispatcher> GetParamBaseTaskDispatcher
     switch (GetIntParam() % INDEX_THREE) {
         case INDEX_ZERO:
             return context->CreateSerialDispatcher(GetStringParam(), GetParamTaskPriority());
-            break;
         case INDEX_ONE:
             return context->CreateParallelDispatcher(GetStringParam(), GetParamTaskPriority());
-            break;
         case INDEX_TWO:
             return specTaskDispatcher;
-            break;
         default:
             return context->CreateSerialDispatcher(GetStringParam(), GetParamTaskPriority());
-            break;
     }
 }
 
diff --git a/tools/dump/src/notification_shell_command.cpp b/tools/dump/src/notification_shell_command.cpp
index 97de8dd95..09e1fafdf 100644
--- a/tools/dump/src/notification_shell_command.cpp
+++ b/tools/dump/src/notification_shell_command.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Huawei Device Co., Ltd.
+ * Copyright (c) 2021-2022 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
-- 
Gitee