From 2f96e273150b42e3d4a176689a1cdf7cc78a949a Mon Sep 17 00:00:00 2001
From: zhaoyuan <zhaoyuan17@huawei.com>
Date: Wed, 29 Sep 2021 15:27:42 +0000
Subject: [PATCH] fixed 9c5636b from
 https://gitee.com/skyblackleon/notification_ans_standard/pulls/44 delete
 fexceptions

Signed-off-by: zhaoyuan <zhaoyuan17@huawei.com>
---
 frameworks/ans/test/moduletest/BUILD.gn                |  4 ----
 interfaces/kits/napi/ans/BUILD.gn                      |  4 +++-
 services/ans/BUILD.gn                                  | 10 +---------
 services/ans/src/notification_preferences_database.cpp |  6 +-----
 services/ans/test/unittest/BUILD.gn                    |  9 +--------
 services/test/moduletest/BUILD.gn                      |  9 +--------
 6 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/frameworks/ans/test/moduletest/BUILD.gn b/frameworks/ans/test/moduletest/BUILD.gn
index 8046c8d17..0912b0646 100755
--- a/frameworks/ans/test/moduletest/BUILD.gn
+++ b/frameworks/ans/test/moduletest/BUILD.gn
@@ -30,10 +30,6 @@ config("public_ans_config") {
   ]
 }
 
-config("json_config") {
-  cflags_cc = [ "-fexceptions" ]
-}
-
 ohos_moduletest("ans_fw_module_test") {
   module_out_path = module_output_path
   include_dirs = [
diff --git a/interfaces/kits/napi/ans/BUILD.gn b/interfaces/kits/napi/ans/BUILD.gn
index 7592885e3..66da3426a 100755
--- a/interfaces/kits/napi/ans/BUILD.gn
+++ b/interfaces/kits/napi/ans/BUILD.gn
@@ -61,6 +61,8 @@ ohos_shared_library("notification") {
     "src/unsubscribe.cpp",
   ]
 
+  ldflags = [ "-Wl,-rpath=/system/lib/module/multimedia/" ]
+
   deps = [
     "${frameworks_path}/ans/core:ans_core",
     "${frameworks_path}/ans/native:ans_innerkits",
@@ -71,7 +73,7 @@ ohos_shared_library("notification") {
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
     "//foundation/ace/napi:ace_napi",
     "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
-    "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
+    "//foundation/multimedia/image_standard/interfaces/innerkits:image",
     "//third_party/jsoncpp:jsoncpp",
     "//third_party/libuv:uv_static",
     "//utils/native/base:utils",
diff --git a/services/ans/BUILD.gn b/services/ans/BUILD.gn
index 629d4414e..180ec3c81 100644
--- a/services/ans/BUILD.gn
+++ b/services/ans/BUILD.gn
@@ -31,15 +31,8 @@ config("public_ans_config") {
   ]
 }
 
-config("json_config") {
-  cflags_cc = [ "-fexceptions" ]
-}
-
 ohos_shared_library("libans") {
-  include_dirs = [
-    "include",
-    "//third_party/json/include",
-  ]
+  include_dirs = [ "include" ]
 
   sources = [
     "src/advanced_notification_service.cpp",
@@ -58,7 +51,6 @@ ohos_shared_library("libans") {
   configs = [
     ":public_ans_config",
     "//utils/native/base:utils_config",
-    ":json_config",
   ]
 
   deps = [
diff --git a/services/ans/src/notification_preferences_database.cpp b/services/ans/src/notification_preferences_database.cpp
index cdfdd9eea..6064a270a 100644
--- a/services/ans/src/notification_preferences_database.cpp
+++ b/services/ans/src/notification_preferences_database.cpp
@@ -956,11 +956,7 @@ void NotificationPreferencesDatabase::StringToVector(const std::string &str, std
 int NotificationPreferencesDatabase::StringToInt(const std::string &str) const
 {
     int value = 0;
-    try {
-        value = stoi(str, nullptr);
-    } catch (const std::exception &e) {
-        ANS_LOGW("Stoi error is %{public}s.", e.what());
-    }
+    value = stoi(str, nullptr);
     return value;
 }
 
diff --git a/services/ans/test/unittest/BUILD.gn b/services/ans/test/unittest/BUILD.gn
index 3179f766d..d94e670af 100644
--- a/services/ans/test/unittest/BUILD.gn
+++ b/services/ans/test/unittest/BUILD.gn
@@ -17,10 +17,6 @@ import("//build/test.gni")
 
 module_output_path = "ans_standard/unittest"
 
-config("json_config") {
-  cflags_cc = [ "-fexceptions" ]
-}
-
 ohos_unittest("ans_unit_test") {
   module_out_path = module_output_path
   include_dirs = [
@@ -71,10 +67,7 @@ ohos_unittest("ans_unit_test") {
     "permission_filter_test.cpp",
   ]
 
-  configs = [
-    "//utils/native/base:utils_config",
-    ":json_config",
-  ]
+  configs = [ "//utils/native/base:utils_config" ]
 
   deps = [
     "${core_path}:ans_core",
diff --git a/services/test/moduletest/BUILD.gn b/services/test/moduletest/BUILD.gn
index 7711118f9..3afbfa5d4 100644
--- a/services/test/moduletest/BUILD.gn
+++ b/services/test/moduletest/BUILD.gn
@@ -17,10 +17,6 @@ import("//build/test.gni")
 
 module_output_path = "ans_standard/moduletest"
 
-config("json_config") {
-  cflags_cc = [ "-fexceptions" ]
-}
-
 ohos_moduletest("ans_module_test") {
   module_out_path = module_output_path
   include_dirs = [
@@ -64,10 +60,7 @@ ohos_moduletest("ans_module_test") {
     "mock/mock_single_kv_store.cpp",
   ]
 
-  configs = [
-    "//utils/native/base:utils_config",
-    ":json_config",
-  ]
+  configs = [ "//utils/native/base:utils_config" ]
 
   deps = [
     "${core_path}:ans_core",
-- 
Gitee