diff --git a/frameworks/ans/core/BUILD.gn b/frameworks/ans/core/BUILD.gn
index 67b5bf418cacc6513f8027846ffb85e8570bc416..346ddd631b302e5e9b14e54aee4d76d76fd96c5f 100644
--- a/frameworks/ans/core/BUILD.gn
+++ b/frameworks/ans/core/BUILD.gn
@@ -28,6 +28,7 @@ config("public_ans_core_config") {
     "${interfaces_path}/innerkits/ans/native/include",
     "${interfaces_path}/innerkits/wantAgent/include",
     "//foundation/aafwk/standard/frameworks/kits/content/cpp/src/ohos/aafwk/content/",
+    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/multimedia/image_standard/interfaces/innerkits/include",
     "//utils/native/base/include",
     "//third_party/json/single_include",
diff --git a/frameworks/ans/native/BUILD.gn b/frameworks/ans/native/BUILD.gn
index fc3cc88e703c7fb7fe90c084e6f637f0747385d8..831a1d1f9996eec56d057cbee42ea0123e182887 100644
--- a/frameworks/ans/native/BUILD.gn
+++ b/frameworks/ans/native/BUILD.gn
@@ -27,6 +27,7 @@ config("ans_innerkits_public_config") {
     "${frameworks_path}/ans/core/include",
     "//foundation/aafwk/standard/frameworks/kits/content/cpp/src/ohos/aafwk/content/",
     "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
+    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/multimedia/image_standard/interfaces/innerkits/include",
     "//third_party/json/single_include",
     "//third_party/jsoncpp/include",
diff --git a/frameworks/ans/native/src/notification.cpp b/frameworks/ans/native/src/notification.cpp
index e7744ceded1ee7c1f57189a58fdb82e14565d486..4b8e26125243f47f0c901a924423bf3469945dec 100644
--- a/frameworks/ans/native/src/notification.cpp
+++ b/frameworks/ans/native/src/notification.cpp
@@ -15,6 +15,7 @@
 
 #include "notification.h"
 
+#include <sstream>
 
 #include "ans_log_wrapper.h"
 
diff --git a/frameworks/ans/native/src/notification_request.cpp b/frameworks/ans/native/src/notification_request.cpp
index 29d6657aa8d70481a06bc93402cd0811129876b5..463ffe7dfe639e759833baaf6de59bb5d4647d7b 100644
--- a/frameworks/ans/native/src/notification_request.cpp
+++ b/frameworks/ans/native/src/notification_request.cpp
@@ -51,13 +51,6 @@ NotificationRequest::NotificationRequest(int32_t notificationId) : notificationI
     deliveryTime_ = GetNowSysTime();
 }
 
-NotificationRequest::NotificationRequest(const std::shared_ptr<AppExecFwk::Context> &context, int32_t notificationId)
-    : notificationId_(notificationId), context_(context)
-{
-    createTime_ = GetNowSysTime();
-    deliveryTime_ = GetNowSysTime();
-}
-
 NotificationRequest::NotificationRequest(const NotificationRequest &other)
 {
     CopyBase(other);
@@ -674,7 +667,6 @@ std::string NotificationRequest::Dump()
             ", unremovable = " + (unremovable_ ? "true" : "false") +
             ", floatingIcon = " + (floatingIcon_ ? "true" : "false") +
             ", onlyLocal = " + (onlyLocal_ ? "true" : "false") + ", permitted = " + (permitted_ ? "true" : "false") +
-            ", context = " + (context_ ? "not null" : "null") + ", wantAgent = " + (wantAgent_ ? "not null" : "null") +
             ", removalWantAgent = " + (removalWantAgent_ ? "not null" : "null") +
             ", maxScreenWantAgent = " + (maxScreenWantAgent_ ? "not null" : "null") +
             ", additionalParams = " + (additionalParams_ ? "not null" : "null") +
@@ -1414,7 +1406,6 @@ void NotificationRequest::CopyOther(const NotificationRequest &other)
     this->onlyLocal_ = other.onlyLocal_;
     this->permitted_ = other.permitted_;
 
-    this->context_ = other.context_;
     this->wantAgent_ = other.wantAgent_;
     this->removalWantAgent_ = other.removalWantAgent_;
     this->maxScreenWantAgent_ = other.maxScreenWantAgent_;
diff --git a/frameworks/ans/native/src/reminder_helper.cpp b/frameworks/ans/native/src/reminder_helper.cpp
index aa36349053cc7d932c44893d24380beafd0aa3e8..39fe3105db9e4289f0e28c590c0e1fc8497bd39b 100644
--- a/frameworks/ans/native/src/reminder_helper.cpp
+++ b/frameworks/ans/native/src/reminder_helper.cpp
@@ -16,6 +16,7 @@
 #include "ans_log_wrapper.h"
 #include "ans_notification.h"
 #include "application_env_impl.h"
+#include "bundle_mgr_interface.h"
 #include "iservice_registry.h"
 #include "notification_helper.h"
 #include "singleton.h"
diff --git a/frameworks/ans/test/moduletest/ans_innerkits_module_publish_test.cpp b/frameworks/ans/test/moduletest/ans_innerkits_module_publish_test.cpp
index b0b055942fa48a2d483cd7d06eed52ec72897627..b9115de5681a661087cc68d8cdab314c0d8eccd8 100644
--- a/frameworks/ans/test/moduletest/ans_innerkits_module_publish_test.cpp
+++ b/frameworks/ans/test/moduletest/ans_innerkits_module_publish_test.cpp
@@ -18,7 +18,6 @@
 #include "ans_inner_errors.h"
 #include "ans_manager_proxy.h"
 #include "advanced_notification_service.h"
-#include "context.h"
 #include "datetime_ex.h"
 #include "if_system_ability_manager.h"
 #include "iservice_registry.h"
diff --git a/frameworks/wantagent/BUILD.gn b/frameworks/wantagent/BUILD.gn
index 9cd371e5af831a94d4c4427a65330513d72fd2fb..906888f13c263e5d4cb096bcb8e1ff54672d6750 100644
--- a/frameworks/wantagent/BUILD.gn
+++ b/frameworks/wantagent/BUILD.gn
@@ -34,6 +34,7 @@ config("wantagent_innerkits_public_config") {
     "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
     "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
     "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include",
+    "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime",
     "//third_party/icu/icu4c/source/common",
   ]
 }
@@ -61,6 +62,7 @@ ohos_shared_library("wantagent_innerkits") {
 
   deps = [
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
     "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//utils/native/base:utils",
diff --git a/frameworks/wantagent/src/pending_want.cpp b/frameworks/wantagent/src/pending_want.cpp
index 5781cdec6b28155c0769083e3e811a8a9ffb6a70..62fddd422e62541b3c80358b9c9b97fc60d0b25c 100644
--- a/frameworks/wantagent/src/pending_want.cpp
+++ b/frameworks/wantagent/src/pending_want.cpp
@@ -40,12 +40,14 @@ WantAgentConstant::OperationType PendingWant::GetType(const sptr<AAFwk::IWantSen
 }
 
 std::shared_ptr<PendingWant> PendingWant::GetAbility(
-    const std::shared_ptr<Context> &context, int requestCode, const std::shared_ptr<Want> &want, unsigned int flags)
+    const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+    int requestCode, const std::shared_ptr<Want> &want, unsigned int flags)
 {
     return GetAbility(context, requestCode, want, flags, nullptr);
 }
 
-std::shared_ptr<PendingWant> PendingWant::GetAbility(const std::shared_ptr<Context> &context, int requestCode,
+std::shared_ptr<PendingWant> PendingWant::GetAbility(
+    const std::shared_ptr<OHOS::AbilityRuntime::Context> &context, int requestCode,
     const std::shared_ptr<Want> &want, unsigned int flags, const std::shared_ptr<WantParams> &options)
 {
     WANT_AGENT_LOGI("PendingWant::GetAbility begin.");
@@ -74,20 +76,21 @@ std::shared_ptr<PendingWant> PendingWant::GetAbility(const std::shared_ptr<Conte
     return std::make_shared<PendingWant>(target);
 }
 
-std::shared_ptr<PendingWant> PendingWant::GetAbilities(const std::shared_ptr<Context> &context, int requestCode,
-    std::vector<std::shared_ptr<Want>> &wants, unsigned int flags)
+std::shared_ptr<PendingWant> PendingWant::GetAbilities(const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+    int requestCode, std::vector<std::shared_ptr<Want>> &wants, unsigned int flags)
 {
     return GetAbilities(context, requestCode, wants, flags, nullptr);
 }
 
-std::shared_ptr<PendingWant> PendingWant::GetAbilities(const std::shared_ptr<Context> &context, int requestCode,
-    std::vector<std::shared_ptr<Want>> &wants, unsigned int flags, const std::shared_ptr<WantParams> &options)
+std::shared_ptr<PendingWant> PendingWant::GetAbilities(const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+    int requestCode, std::vector<std::shared_ptr<Want>> &wants,
+    unsigned int flags, const std::shared_ptr<WantParams> &options)
 {
     if (context == nullptr) {
         WANT_AGENT_LOGE("PendingWant::GetAbilities invalid input param.");
         return nullptr;
     }
-
+    
     WantSenderInfo wantSenderInfo;
     wantSenderInfo.type = (int32_t)WantAgentConstant::OperationType::START_ABILITIES;
     wantSenderInfo.bundleName = context->GetBundleName();
@@ -111,13 +114,15 @@ std::shared_ptr<PendingWant> PendingWant::GetAbilities(const std::shared_ptr<Con
 }
 
 std::shared_ptr<PendingWant> PendingWant::GetCommonEvent(
-    const std::shared_ptr<Context> &context, int requestCode, const std::shared_ptr<Want> &want, unsigned int flags)
+    const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+    int requestCode, const std::shared_ptr<Want> &want, unsigned int flags)
 {
     return GetCommonEventAsUser(context, requestCode, want, flags, 0);
 }
 
-std::shared_ptr<PendingWant> PendingWant::GetCommonEventAsUser(const std::shared_ptr<Context> &context, int requestCode,
-    const std::shared_ptr<Want> &want, unsigned int flags, int uid)
+std::shared_ptr<PendingWant> PendingWant::GetCommonEventAsUser(
+    const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+    int requestCode, const std::shared_ptr<Want> &want, unsigned int flags, int uid)
 {
     if (context == nullptr) {
         WANT_AGENT_LOGE("PendingWant::GetCommonEventAsUser invalid input param.");
@@ -143,21 +148,25 @@ std::shared_ptr<PendingWant> PendingWant::GetCommonEventAsUser(const std::shared
 }
 
 std::shared_ptr<PendingWant> PendingWant::GetService(
-    const std::shared_ptr<Context> &context, int requestCode, const std::shared_ptr<Want> &want, unsigned int flags)
+    const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+    int requestCode, const std::shared_ptr<Want> &want, unsigned int flags)
 {
-    return BuildServicePendingWant(context, requestCode, want, flags, WantAgentConstant::OperationType::START_SERVICE);
+    return BuildServicePendingWant(context, requestCode, want, flags,
+        WantAgentConstant::OperationType::START_SERVICE);
 }
 
 std::shared_ptr<PendingWant> PendingWant::GetForegroundService(
-    const std::shared_ptr<Context> &context, int requestCode, const std::shared_ptr<Want> &want, unsigned int flags)
+    const std::shared_ptr<OHOS::AbilityRuntime::Context> &context, int requestCode,
+    const std::shared_ptr<Want> &want, unsigned int flags)
 {
     return BuildServicePendingWant(
         context, requestCode, want, flags, WantAgentConstant::OperationType::START_FOREGROUND_SERVICE);
 }
 
-std::shared_ptr<PendingWant> PendingWant::BuildServicePendingWant(const std::shared_ptr<Context> &context,
-    int requestCode, const std::shared_ptr<Want> &want, unsigned int flags,
-    WantAgentConstant::OperationType serviceKind)
+std::shared_ptr<PendingWant> PendingWant::BuildServicePendingWant(
+    const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+    int requestCode, const std::shared_ptr<Want> &want,
+    unsigned int flags, WantAgentConstant::OperationType serviceKind)
 {
     if (context == nullptr) {
         WANT_AGENT_LOGE("PendingWant::BuildServicePendingWant invalid input param.");
@@ -189,59 +198,54 @@ void PendingWant::Cancel(const sptr<AAFwk::IWantSender> &target)
 
 void PendingWant::Send(const sptr<AAFwk::IWantSender> &target)
 {
-    Send(nullptr, 0, nullptr, nullptr, "", nullptr, target);
+    Send(0, nullptr, nullptr, "", nullptr, target);
 }
 
 void PendingWant::Send(int resultCode, const sptr<AAFwk::IWantSender> &target)
 {
-    Send(nullptr, resultCode, nullptr, nullptr, "", nullptr, target);
+    Send(resultCode, nullptr, nullptr, "", nullptr, target);
 }
 
-void PendingWant::Send(const std::shared_ptr<Context> &context, int resultCode, const std::shared_ptr<Want> &want,
+void PendingWant::Send(int resultCode, const std::shared_ptr<Want> &want,
     const sptr<AAFwk::IWantSender> &target)
 {
-    Send(context, resultCode, want, nullptr, "", nullptr, target);
+    Send(resultCode, want, nullptr, "", nullptr, target);
 }
 
 void PendingWant::Send(
     int resultCode, const sptr<CompletedDispatcher> &onCompleted, const sptr<AAFwk::IWantSender> &target)
 {
-    Send(nullptr, resultCode, nullptr, onCompleted, "", nullptr, target);
+    Send(resultCode, nullptr, onCompleted, "", nullptr, target);
 }
 
-void PendingWant::Send(const std::shared_ptr<Context> &context, int resultCode, const std::shared_ptr<Want> &want,
+void PendingWant::Send(int resultCode, const std::shared_ptr<Want> &want,
     const sptr<CompletedDispatcher> &onCompleted, const sptr<AAFwk::IWantSender> &target)
 {
-    Send(context, resultCode, want, onCompleted, "", nullptr, target);
+    Send(resultCode, want, onCompleted, "", nullptr, target);
 }
 
-void PendingWant::Send(const std::shared_ptr<Context> &context, int resultCode, const std::shared_ptr<Want> &want,
+void PendingWant::Send(int resultCode, const std::shared_ptr<Want> &want,
     const sptr<CompletedDispatcher> &onCompleted, const std::string &requiredPermission,
     const sptr<AAFwk::IWantSender> &target)
 {
-    Send(context, resultCode, want, onCompleted, requiredPermission, nullptr, target);
+    Send(resultCode, want, onCompleted, requiredPermission, nullptr, target);
 }
 
-void PendingWant::Send(const std::shared_ptr<Context> &context, int resultCode, const std::shared_ptr<Want> &want,
+void PendingWant::Send(int resultCode, const std::shared_ptr<Want> &want,
     const sptr<CompletedDispatcher> &onCompleted, const std::string &requiredPermission,
     const std::shared_ptr<WantParams> &options, const sptr<AAFwk::IWantSender> &target)
 {
     HILOG_INFO("%{public}s:begin.", __func__);
-    if (SendAndReturnResult(context, resultCode, want, onCompleted, requiredPermission, options, target) != 0) {
+    if (SendAndReturnResult(resultCode, want, onCompleted, requiredPermission, options, target) != 0) {
         WANT_AGENT_LOGE("PendingWant::SendAndReturnResult failed.");
     }
 }
 
-int PendingWant::SendAndReturnResult(const std::shared_ptr<Context> &context, int resultCode,
-    const std::shared_ptr<Want> &want, const sptr<CompletedDispatcher> &onCompleted,
-    const std::string &requiredPermission, const std::shared_ptr<WantParams> &options,
-    const sptr<AAFwk::IWantSender> &target)
+int PendingWant::SendAndReturnResult(int resultCode, const std::shared_ptr<Want> &want,
+    const sptr<CompletedDispatcher> &onCompleted, const std::string &requiredPermission,
+    const std::shared_ptr<WantParams> &options, const sptr<AAFwk::IWantSender> &target)
 {
     HILOG_INFO("%{public}s:begin.", __func__);
-    if (context == nullptr) {
-        WANT_AGENT_LOGE("PendingWant::SendAndReturnResult invalid input param.");
-        return 1;
-    }
 
     SenderInfo senderInfo;
     senderInfo.resolvedType = want != nullptr ? want->GetType() : "";
diff --git a/frameworks/wantagent/src/want_agent_helper.cpp b/frameworks/wantagent/src/want_agent_helper.cpp
index 7f3d0cb13f8ae6bb9e7cb12f65186eb86eb8fd10..4c60303345b20f2cfd73c1caec251ae689f6cb59 100644
--- a/frameworks/wantagent/src/want_agent_helper.cpp
+++ b/frameworks/wantagent/src/want_agent_helper.cpp
@@ -64,7 +64,7 @@ unsigned int WantAgentHelper::FlagsTransformer(const std::vector<WantAgentConsta
 }
 
 std::shared_ptr<WantAgent> WantAgentHelper::GetWantAgent(
-    const std::shared_ptr<Context> &context, const WantAgentInfo &paramsInfo)
+    const std::shared_ptr<OHOS::AbilityRuntime::Context> &context, const WantAgentInfo &paramsInfo)
 {
     WANT_AGENT_LOGI("WantAgentHelper::GetWantAgent begin.");
     if (context == nullptr) {
@@ -175,11 +175,11 @@ WantAgentConstant::OperationType WantAgentHelper::GetType(const std::shared_ptr<
     return agent->GetPendingWant()->GetType(agent->GetPendingWant()->GetTarget());
 }
 
-void WantAgentHelper::TriggerWantAgent(const std::shared_ptr<Context> &context, const std::shared_ptr<WantAgent> &agent,
+void WantAgentHelper::TriggerWantAgent(const std::shared_ptr<WantAgent> &agent,
     const std::shared_ptr<CompletedCallback> &callback, const TriggerInfo &paramsInfo)
 {
     HILOG_INFO("%{public}s:begin.", __func__);
-    if ((context == nullptr) || (agent == nullptr)) {
+    if (agent == nullptr) {
         WANT_AGENT_LOGE("WantAgentHelper::TriggerWantAgent invalid input param.");
         return;
     }
@@ -191,20 +191,19 @@ void WantAgentHelper::TriggerWantAgent(const std::shared_ptr<Context> &context,
         dispatcher = new (std::nothrow) CompletedDispatcher(pendingWant, callback, nullptr);
     }
 
-    Send(context, pendingWant, type, dispatcher, paramsInfo);
+    Send(pendingWant, type, dispatcher, paramsInfo);
 }
 
-void WantAgentHelper::Send(const std::shared_ptr<Context> &context, const std::shared_ptr<PendingWant> &pendingWant,
+void WantAgentHelper::Send(const std::shared_ptr<PendingWant> &pendingWant,
     WantAgentConstant::OperationType type, const sptr<CompletedDispatcher> &callBack, const TriggerInfo &paramsInfo)
 {
     HILOG_INFO("%{public}s:begin.", __func__);
-    if ((context == nullptr) || (pendingWant == nullptr)) {
+    if (pendingWant == nullptr) {
         WANT_AGENT_LOGE("WantAgentHelper::Send invalid input param.");
         return;
     }
 
-    pendingWant->Send(context,
-        paramsInfo.GetResultCode(),
+    pendingWant->Send(paramsInfo.GetResultCode(),
         paramsInfo.GetWant(),
         callBack,
         paramsInfo.GetPermission(),
diff --git a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn
index 288269d7674c65427a2bf21d49006ced844e6c78..d32c1281bde3992b2e11435af4e77dcda298a81a 100644
--- a/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn
+++ b/frameworks/wantagent/test/unittest/pending_want_test/BUILD.gn
@@ -21,6 +21,7 @@ ohos_unittest("pending_want_test") {
   module_out_path = module_output_path
   include_dirs = [
     "//foundation/aafwk/standard/interfaces/innerkits/want/include",
+    "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime",
     "//foundation/aafwk/standard/services/abilitymgr/include",
     "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/",
     "//utils/system/safwk/native/include",
@@ -38,6 +39,7 @@ ohos_unittest("pending_want_test") {
     "${core_path}:ans_core",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
     "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
diff --git a/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp b/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp
index 196a3e36309e7bbf810c5638f4a12a983cc47385..4f66a28dcc39fa3bd42e63c5bab3c49a1111cfe2 100644
--- a/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp
+++ b/frameworks/wantagent/test/unittest/pending_want_test/pending_want_test.cpp
@@ -14,12 +14,11 @@
  */
 
 #include <gtest/gtest.h>
-#include "ability_context.h"
 #include "ability_manager_client.h"
 #include "cancel_listener.h"
 #include "completed_callback.h"
 #include "completed_dispatcher.h"
-#include "context.h"
+#include "context/context.h"
 #include "context_container.h"
 #include "element_name.h"
 #include "event_handler.h"
@@ -101,6 +100,11 @@ Want PendingWantTest::MakeWant(std::string deviceId, std::string abilityName, st
     return want;
 }
 
+std::shared_ptr<OHOS::AbilityRuntime::Context> GetAppContext()
+{
+    return OHOS::AbilityRuntime::Context::GetApplicationContext();
+}
+
 void PendingWantTest::SetUpTestCase(void)
 {}
 
@@ -166,7 +170,7 @@ HWTEST_F(PendingWantTest, PendingWant_0400, Function | MediumTest | Level1)
     want->SetElement(element);
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbility(nullptr, requestCode, want, flags);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbility(GetAppContext(), requestCode, want, flags);
     EXPECT_EQ(pendingWant, nullptr);
 }
 
@@ -177,14 +181,13 @@ HWTEST_F(PendingWantTest, PendingWant_0400, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_0500, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
     want->SetElement(element);
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbility(context, requestCode, want, flags);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbility(GetAppContext(), requestCode, want, flags);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -195,7 +198,6 @@ HWTEST_F(PendingWantTest, PendingWant_0500, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_0600, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
@@ -206,7 +208,8 @@ HWTEST_F(PendingWantTest, PendingWant_0600, Function | MediumTest | Level1)
     wParams->SetParam(key, Boolean::Box(value));
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbility(context, requestCode, want, flags, wParams);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbility(
+        GetAppContext(), requestCode, want, flags, wParams);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -229,7 +232,8 @@ HWTEST_F(PendingWantTest, PendingWant_0700, Function | MediumTest | Level1)
     wants.emplace_back(want2);
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbilities(nullptr, requestCode, wants, flags);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbilities(
+        nullptr, requestCode, wants, flags);
     EXPECT_EQ(pendingWant, nullptr);
 }
 
@@ -240,7 +244,6 @@ HWTEST_F(PendingWantTest, PendingWant_0700, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_0800, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
@@ -253,7 +256,8 @@ HWTEST_F(PendingWantTest, PendingWant_0800, Function | MediumTest | Level1)
     wants.emplace_back(want2);
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbilities(context, requestCode, wants, flags);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbilities(
+        GetAppContext(), requestCode, wants, flags);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -264,7 +268,6 @@ HWTEST_F(PendingWantTest, PendingWant_0800, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_0900, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
@@ -281,7 +284,8 @@ HWTEST_F(PendingWantTest, PendingWant_0900, Function | MediumTest | Level1)
     wParams->SetParam(key, Boolean::Box(value));
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbilities(context, requestCode, wants, flags, wParams);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetAbilities(
+        GetAppContext(), requestCode, wants, flags, wParams);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -298,7 +302,8 @@ HWTEST_F(PendingWantTest, PendingWant_1000, Function | MediumTest | Level1)
     want->SetElement(element);
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetCommonEventAsUser(nullptr, requestCode, want, flags, 0);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetCommonEventAsUser(
+        nullptr, requestCode, want, flags, 0);
     EXPECT_EQ(pendingWant, nullptr);
 }
 
@@ -309,14 +314,14 @@ HWTEST_F(PendingWantTest, PendingWant_1000, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_1100, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
     want->SetElement(element);
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetCommonEventAsUser(context, requestCode, want, flags, 0);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetCommonEventAsUser(
+	    GetAppContext(), requestCode, want, flags, 0);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -327,12 +332,12 @@ HWTEST_F(PendingWantTest, PendingWant_1100, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_1200, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want;
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetCommonEventAsUser(context, requestCode, want, flags, 0);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetCommonEventAsUser(
+	    GetAppContext(), requestCode, want, flags, 0);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -343,12 +348,12 @@ HWTEST_F(PendingWantTest, PendingWant_1200, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_1300, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want;
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetService(context, requestCode, want, flags);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetService(
+	    GetAppContext(), requestCode, want, flags);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -376,12 +381,12 @@ HWTEST_F(PendingWantTest, PendingWant_1400, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_1500, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want;
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
-    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetForegroundService(context, requestCode, want, flags);
+    std::shared_ptr<PendingWant> pendingWant = PendingWant::GetForegroundService(
+	    GetAppContext(), requestCode, want, flags);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -409,14 +414,13 @@ HWTEST_F(PendingWantTest, PendingWant_1600, Function | MediumTest | Level1)
  */
 HWTEST_F(PendingWantTest, PendingWant_1700, Function | MediumTest | Level1)
 {
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want;
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
     WantAgentConstant::OperationType type = WantAgentConstant::OperationType::START_FOREGROUND_SERVICE;
     std::shared_ptr<PendingWant> pendingWant =
-        PendingWant::BuildServicePendingWant(context, requestCode, want, flags, type);
+        PendingWant::BuildServicePendingWant(GetAppContext(), requestCode, want, flags, type);
     EXPECT_NE(pendingWant, nullptr);
 }
 
@@ -474,7 +478,6 @@ HWTEST_F(PendingWantTest, PendingWant_2000, Function | MediumTest | Level1)
 HWTEST_F(PendingWantTest, PendingWant_2100, Function | MediumTest | Level1)
 {
     PendingWant pendingWant(nullptr);
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     int requestCode = 10;
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
@@ -487,7 +490,7 @@ HWTEST_F(PendingWantTest, PendingWant_2100, Function | MediumTest | Level1)
     flags |= FLAG_NO_CREATE;
     AbilityManagerClient::GetInstance()->Connect();
     EXPECT_EQ(INNER_ERR,
-        pendingWant.SendAndReturnResult(context, requestCode, want, nullptr, "Permission", nullptr, nullptr));
+        pendingWant.SendAndReturnResult(requestCode, want, nullptr, "Permission", nullptr, nullptr));
 }
 
 /*
@@ -509,7 +512,7 @@ HWTEST_F(PendingWantTest, PendingWant_2200, Function | MediumTest | Level1)
     unsigned int flags = 1;
     flags |= FLAG_NO_CREATE;
     AbilityManagerClient::GetInstance()->Connect();
-    EXPECT_EQ(1, pendingWant.SendAndReturnResult(nullptr, requestCode, want, nullptr, "Permission", nullptr, nullptr));
+    EXPECT_EQ(1, pendingWant.SendAndReturnResult(requestCode, want, nullptr, "Permission", nullptr, nullptr));
 }
 
 /*
diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
index c0ba473662424d30b7f766032e696f0a0a5cc5f5..3c9a829612b63bdabe38dd92a06addb3f9845ed0 100644
--- a/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
+++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
@@ -20,6 +20,7 @@ module_output_path = "ans_standard/wantagent"
 ohos_unittest("want_agent_helper_test") {
   module_out_path = module_output_path
   include_dirs = [
+    "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime",
     "//foundation/aafwk/standard/interfaces/innerkits/want/include",
     "//foundation/aafwk/standard/services/abilitymgr/include",
   ]
@@ -35,6 +36,7 @@ ohos_unittest("want_agent_helper_test") {
     "${core_path}:ans_core",
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
     "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/services/abilitymgr:abilityms",
     "//third_party/googletest:gmock_main",
diff --git a/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp b/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp
index 32776ba988df14c949fc07fb36714a7d6e0ad7b5..f555062ad2331e5fbdb0fca08149d222827aa6ca 100644
--- a/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp
+++ b/frameworks/wantagent/test/unittest/want_agent_helper_test/want_agent_helper_test.cpp
@@ -16,8 +16,8 @@
 #include <gtest/gtest.h>
 #include "ability_context.h"
 #include "completed_callback.h"
-#include "context.h"
 #include "context_container.h"
+#include "context/context.h"
 #include "element_name.h"
 #include "event_handler.h"
 #include "ohos/aafwk/base/base_types.h"
@@ -177,7 +177,6 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_0700, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_0800, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     WantAgentInfo wantAgentInfo;
     auto wantAgent = wantAgentHelper->GetWantAgent(nullptr, wantAgentInfo);
     EXPECT_EQ(wantAgent, nullptr);
@@ -192,7 +191,6 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_0800, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_0900, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
     WantAgentInfo wantAgentInfo;
     wantAgentInfo.wants_.clear();
     auto wantAgent = wantAgentHelper->GetWantAgent(nullptr, wantAgentInfo);
@@ -208,7 +206,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_0900, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_1000, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
+    std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
     WantAgentInfo wantAgentInfo;
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
@@ -229,7 +227,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1000, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_1100, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
+    std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
     WantAgentInfo wantAgentInfo;
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
@@ -251,7 +249,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1100, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_1200, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
+    std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
     want->SetElement(element);
@@ -275,7 +273,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1200, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_1300, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
+    std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
     want->SetElement(element);
@@ -299,7 +297,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1300, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_1400, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
+    std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
     want->SetElement(element);
@@ -323,7 +321,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1400, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_1500, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
+    std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
     want->SetElement(element);
@@ -347,7 +345,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1500, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_1600, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
+    std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
     want->SetElement(element);
@@ -371,7 +369,7 @@ HWTEST_F(WantAgentHelperTest, WantAgentHelper_1600, Function | MediumTest | Leve
 HWTEST_F(WantAgentHelperTest, WantAgentHelper_1700, Function | MediumTest | Level1)
 {
     std::shared_ptr<WantAgentHelper> wantAgentHelper = std::make_shared<WantAgentHelper>();
-    std::shared_ptr<Context> context = std::make_shared<AbilityContext>();
+    std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
     std::shared_ptr<Want> want = std::make_shared<Want>();
     ElementName element("device", "bundleName", "abilityName");
     want->SetElement(element);
diff --git a/frameworks/wantagent/test/unittest/want_agent_info_test/want_agent_info_test.cpp b/frameworks/wantagent/test/unittest/want_agent_info_test/want_agent_info_test.cpp
index b3b03055a5e7cc6459be00aea2b5f3e754042976..f724367661687b75396c3d8df34c1a41c9d67bcd 100644
--- a/frameworks/wantagent/test/unittest/want_agent_info_test/want_agent_info_test.cpp
+++ b/frameworks/wantagent/test/unittest/want_agent_info_test/want_agent_info_test.cpp
@@ -16,7 +16,6 @@
 #include <gtest/gtest.h>
 #include "ability_context.h"
 #include "completed_callback.h"
-#include "context.h"
 #include "context_container.h"
 #include "element_name.h"
 #include "event_handler.h"
diff --git a/frameworks/wantagent/test/unittest/want_agent_test/want_agent_test.cpp b/frameworks/wantagent/test/unittest/want_agent_test/want_agent_test.cpp
index 8d7ef1d52a3e640e410154e82baa091e9e80dd9c..f8694df0ed096d59dcf23018775a4a18c7fdff0d 100644
--- a/frameworks/wantagent/test/unittest/want_agent_test/want_agent_test.cpp
+++ b/frameworks/wantagent/test/unittest/want_agent_test/want_agent_test.cpp
@@ -16,7 +16,6 @@
 #include <gtest/gtest.h>
 #include "ability_context.h"
 #include "completed_callback.h"
-#include "context.h"
 #include "context_container.h"
 #include "element_name.h"
 #include "event_handler.h"
diff --git a/interfaces/innerkits/ans/native/include/notification_request.h b/interfaces/innerkits/ans/native/include/notification_request.h
index c7f59f8e3790574b99132acd95facad6d6dff207..93b5f2d9a8f233e70d17ddac8b1c7ac0df83b2c6 100644
--- a/interfaces/innerkits/ans/native/include/notification_request.h
+++ b/interfaces/innerkits/ans/native/include/notification_request.h
@@ -16,7 +16,6 @@
 #ifndef BASE_NOTIFICATION_ANS_STANDARD_KITS_NATIVE_INCLUDE_NOTIFICATION_REQUEST_H
 #define BASE_NOTIFICATION_ANS_STANDARD_KITS_NATIVE_INCLUDE_NOTIFICATION_REQUEST_H
 
-#include "context.h"
 #include "message_user.h"
 #include "notification_action_button.h"
 #include "notification_content.h"
@@ -149,14 +148,6 @@ public:
      */
     explicit NotificationRequest(int32_t notificationId);
 
-    /**
-     * A constructor used to create a NotificationRequest instance based on the specified context and notification ID.
-     * To publish a notification with a custom view, you must call such a constructor with the Context specified.
-     * @param context the specified context
-     * @param notificationId notification ID
-     */
-    NotificationRequest(const std::shared_ptr<AppExecFwk::Context> &context, int32_t notificationId);
-
     /**
      * A constructor used to create a NotificationRequest instance by copying parameters from an existing one.
      * @param other the existing object
@@ -1012,7 +1003,6 @@ private:
     bool onlyLocal_ {false};
     bool permitted_ {true};
 
-    std::shared_ptr<AppExecFwk::Context> context_ {};
     std::shared_ptr<WantAgent::WantAgent> wantAgent_ {};
     std::shared_ptr<WantAgent::WantAgent> removalWantAgent_ {};
     std::shared_ptr<WantAgent::WantAgent> maxScreenWantAgent_ {};
diff --git a/interfaces/innerkits/wantagent/include/pending_want.h b/interfaces/innerkits/wantagent/include/pending_want.h
index 4f034279f0a0c4086373f13c8e8bafa4ce37683f..ece50a14e2ac03fc644511454ed7ecfac1502340 100644
--- a/interfaces/innerkits/wantagent/include/pending_want.h
+++ b/interfaces/innerkits/wantagent/include/pending_want.h
@@ -21,13 +21,15 @@
 #include <mutex>
 #include <memory>
 #include "cancel_listener.h"
-#include "context.h"
+#include "context/context.h"
 #include "completed_dispatcher.h"
 #include "event_handler.h"
 #include "want.h"
 #include "want_agent_constant.h"
-#include "want_receiver_stub.h"
 #include "want_params.h"
+#include "want_receiver_stub.h"
+#include "want_sender_info.h"
+#include "want_sender_stub.h"
 
 namespace OHOS::Notification::WantAgent {
 class PendingWant final : public std::enable_shared_from_this<PendingWant>, public Parcelable {
@@ -53,8 +55,8 @@ public:
      * parameters.  May return null only if FLAG_NO_CREATE has been
      * supplied.
      */
-    static std::shared_ptr<PendingWant> GetAbility(const std::shared_ptr<AppExecFwk::Context> &context, int requestCode,
-        const std::shared_ptr<AAFwk::Want> &want, unsigned int flags);
+    static std::shared_ptr<PendingWant> GetAbility(const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+        int requestCode, const std::shared_ptr<AAFwk::Want> &want, unsigned int flags);
 
     /**
      * Retrieve a PendingWant that will start a new ability
@@ -72,9 +74,9 @@ public:
      * parameters.  May return null only if FLAG_NO_CREATE has been
      * supplied.
      */
-    static std::shared_ptr<PendingWant> GetAbility(const std::shared_ptr<AppExecFwk::Context> &context, int requestCode,
-        const std::shared_ptr<AAFwk::Want> &want, unsigned int flags,
-        const std::shared_ptr<AAFwk::WantParams> &options);
+    static std::shared_ptr<PendingWant> GetAbility(const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+        int requestCode, const std::shared_ptr<AAFwk::Want> &want,
+        unsigned int flags, const std::shared_ptr<AAFwk::WantParams> &options);
 
     /**
      * Like GetAbility(Context, int, Want, int)}, but allows an
@@ -93,7 +95,7 @@ public:
      * parameters.  May return null only if FLAG_NO_CREATE has been
      * supplied.
      */
-    static std::shared_ptr<PendingWant> GetAbilities(const std::shared_ptr<AppExecFwk::Context> &context,
+    static std::shared_ptr<PendingWant> GetAbilities(const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
         int requestCode, std::vector<std::shared_ptr<AAFwk::Want>> &wants, unsigned int flags);
 
     /**
@@ -114,7 +116,7 @@ public:
      * parameters.  May return null only if FLAG_NO_CREATE has been
      * supplied.
      */
-    static std::shared_ptr<PendingWant> GetAbilities(const std::shared_ptr<AppExecFwk::Context> &context,
+    static std::shared_ptr<PendingWant> GetAbilities(const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
         int requestCode, std::vector<std::shared_ptr<AAFwk::Want>> &wants, unsigned int flags,
         const std::shared_ptr<AAFwk::WantParams> &options);
 
@@ -133,14 +135,15 @@ public:
      * parameters.  May return null only if FLAG_NO_CREATE has been
      * supplied.
      */
-    static std::shared_ptr<PendingWant> GetCommonEvent(const std::shared_ptr<AppExecFwk::Context> &context,
+    static std::shared_ptr<PendingWant> GetCommonEvent(const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
         int requestCode, const std::shared_ptr<AAFwk::Want> &want, unsigned int flags);
 
     /**
      * Note that current user will be interpreted at the time the
      * common event is sent, not when the pending want is created.
      */
-    static std::shared_ptr<PendingWant> GetCommonEventAsUser(const std::shared_ptr<AppExecFwk::Context> &context,
+    static std::shared_ptr<PendingWant> GetCommonEventAsUser(
+        const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
         int requestCode, const std::shared_ptr<AAFwk::Want> &want, unsigned int flags, int uid);
 
     /**
@@ -158,8 +161,9 @@ public:
      * parameters.  May return null only if FLAG_NO_CREATE has been
      * supplied.
      */
-    static std::shared_ptr<PendingWant> GetService(const std::shared_ptr<AppExecFwk::Context> &context, int requestCode,
-        const std::shared_ptr<AAFwk::Want> &want, unsigned int flags);
+    static std::shared_ptr<PendingWant> GetService(
+        const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
+        int requestCode, const std::shared_ptr<AAFwk::Want> &want, unsigned int flags);
 
     /**
      * Retrieve a PendingWant that will start a foreground service.
@@ -176,7 +180,8 @@ public:
      * parameters.  May return null only if FLAG_NO_CREATE has been
      * supplied.
      */
-    static std::shared_ptr<PendingWant> GetForegroundService(const std::shared_ptr<AppExecFwk::Context> &context,
+    static std::shared_ptr<PendingWant> GetForegroundService(
+        const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
         int requestCode, const std::shared_ptr<AAFwk::Want> &want, unsigned int flags);
 
     /**
@@ -204,28 +209,26 @@ public:
 
     void Send(int resultCode, const sptr<AAFwk::IWantSender> &target);
 
-    void Send(const std::shared_ptr<AppExecFwk::Context> &context, int resultCode,
+    void Send(int resultCode,
         const std::shared_ptr<AAFwk::Want> &want, const sptr<AAFwk::IWantSender> &target);
 
     void Send(int resultCode, const sptr<CompletedDispatcher> &onCompleted, const sptr<AAFwk::IWantSender> &target);
 
-    void Send(const std::shared_ptr<AppExecFwk::Context> &context, int resultCode,
+    void Send(int resultCode,
         const std::shared_ptr<AAFwk::Want> &want, const sptr<CompletedDispatcher> &onCompleted,
         const sptr<AAFwk::IWantSender> &target);
 
-    void Send(const std::shared_ptr<AppExecFwk::Context> &context, int resultCode,
+    void Send(int resultCode,
         const std::shared_ptr<AAFwk::Want> &want, const sptr<CompletedDispatcher> &onCompleted,
         const std::string &requiredPermission, const sptr<AAFwk::IWantSender> &target);
 
-    void Send(const std::shared_ptr<AppExecFwk::Context> &context, int resultCode,
-        const std::shared_ptr<AAFwk::Want> &want, const sptr<CompletedDispatcher> &onCompleted,
-        const std::string &requiredPermission, const std::shared_ptr<AAFwk::WantParams> &options,
-        const sptr<AAFwk::IWantSender> &target);
+    void Send(int resultCode, const std::shared_ptr<AAFwk::Want> &want,
+        const sptr<CompletedDispatcher> &onCompleted, const std::string &requiredPermission,
+        const std::shared_ptr<AAFwk::WantParams> &options, const sptr<AAFwk::IWantSender> &target);
 
-    int SendAndReturnResult(const std::shared_ptr<AppExecFwk::Context> &context, int resultCode,
-        const std::shared_ptr<AAFwk::Want> &want, const sptr<CompletedDispatcher> &onCompleted,
-        const std::string &requiredPermission, const std::shared_ptr<AAFwk::WantParams> &options,
-        const sptr<AAFwk::IWantSender> &target);
+    int SendAndReturnResult(int resultCode, const std::shared_ptr<AAFwk::Want> &want,
+        const sptr<CompletedDispatcher> &onCompleted, const std::string &requiredPermission,
+        const std::shared_ptr<AAFwk::WantParams> &options, const sptr<AAFwk::IWantSender> &target);
 
     std::string GetBundleName(const sptr<AAFwk::IWantSender> &target);
 
@@ -269,7 +272,8 @@ private:
         std::weak_ptr<PendingWant> outerInstance_;
     };
 
-    static std::shared_ptr<PendingWant> BuildServicePendingWant(const std::shared_ptr<AppExecFwk::Context> &context,
+    static std::shared_ptr<PendingWant> BuildServicePendingWant(
+        const std::shared_ptr<OHOS::AbilityRuntime::Context> &context,
         int requestCode, const std::shared_ptr<AAFwk::Want> &want, unsigned int flags,
         WantAgentConstant::OperationType serviceKind);
 };
diff --git a/interfaces/innerkits/wantagent/include/want_agent_helper.h b/interfaces/innerkits/wantagent/include/want_agent_helper.h
index 56e554f2dd697717c6b9cd23d0e3ebb6a6a8171f..52ea8d9834df9aa417a20d5880035047c69f349c 100644
--- a/interfaces/innerkits/wantagent/include/want_agent_helper.h
+++ b/interfaces/innerkits/wantagent/include/want_agent_helper.h
@@ -18,7 +18,7 @@
 
 #include <string>
 #include <memory>
-#include "context.h"
+#include "context/context.h"
 #include "completed_callback.h"
 #include "completed_dispatcher.h"
 #include "event_handler.h"
@@ -55,7 +55,7 @@ public:
      * @return Returns the created WantAgent object.
      */
     static std::shared_ptr<WantAgent> GetWantAgent(
-        const std::shared_ptr<OHOS::AppExecFwk::Context> &context, const WantAgentInfo &paramsInfo);
+        const std::shared_ptr<OHOS::AbilityRuntime::Context> &context, const WantAgentInfo &paramsInfo);
 
     /**
      * Obtains an WantAgent object.
@@ -92,8 +92,8 @@ public:
      * the current process.
      * @param paramsInfo Indicates the TriggerInfo object that contains triggering parameters.
      */
-    static void TriggerWantAgent(const std::shared_ptr<AppExecFwk::Context> &context,
-        const std::shared_ptr<WantAgent> &agent, const std::shared_ptr<CompletedCallback> &callback,
+    static void TriggerWantAgent(const std::shared_ptr<WantAgent> &agent,
+        const std::shared_ptr<CompletedCallback> &callback,
         const TriggerInfo &paramsInfo);
 
     /**
@@ -185,9 +185,10 @@ private:
     virtual ~WantAgentHelper() = default;
 
 private:
-    static void Send(const std::shared_ptr<AppExecFwk::Context> &context,
-        const std::shared_ptr<PendingWant> &pendingWant, WantAgentConstant::OperationType type,
-        const sptr<CompletedDispatcher> &callBack, const TriggerInfo &paramsInfo);
+    static void Send(const std::shared_ptr<PendingWant> &pendingWant,
+        WantAgentConstant::OperationType type,
+        const sptr<CompletedDispatcher> &callBack,
+        const TriggerInfo &paramsInfo);
 
     static unsigned int FlagsTransformer(const std::vector<WantAgentConstant::Flags> &flags);
 };
diff --git a/interfaces/kits/napi/wantagent/BUILD.gn b/interfaces/kits/napi/wantagent/BUILD.gn
index 6be10abf7365910855908009beb10ed8a66c9a2b..aa6721afb4d4ee66852ae9bccc460701e9ca8327 100644
--- a/interfaces/kits/napi/wantagent/BUILD.gn
+++ b/interfaces/kits/napi/wantagent/BUILD.gn
@@ -22,6 +22,7 @@ ohos_shared_library("wantagent") {
     "//utils/system/safwk/native/include",
     "//third_party/libuv/include",
     "//foundation/aafwk/standard/frameworks/kits/ability/native/include",
+    "//foundation/aafwk/standard/frameworks/kits/appkit/native/ability_runtime",
     "//foundation/aafwk/standard/services/abilitymgr/include",
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common",
     "//foundation/aafwk/standard/services/common/include",
@@ -36,7 +37,12 @@ ohos_shared_library("wantagent") {
   deps = [
     "${frameworks_path}/wantagent:wantagent_innerkits",
     "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
+    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
+    "//foundation/ace/napi:ace_napi",
+    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
+    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
     "//utils/native/base:utils",
   ]
 
diff --git a/interfaces/kits/napi/wantagent/napi_want_agent.cpp b/interfaces/kits/napi/wantagent/napi_want_agent.cpp
index 8239cca49364d8e22af4f216be2c6c7816500e45..c530972e4c90d2e07558ab9120c5304ba5a359bf 100644
--- a/interfaces/kits/napi/wantagent/napi_want_agent.cpp
+++ b/interfaces/kits/napi/wantagent/napi_want_agent.cpp
@@ -790,8 +790,7 @@ auto NAPI_TriggerWrapExecuteCallBack = [](napi_env env, void *data) {
     AsyncTriggerCallbackInfo *asyncCallbackInfo = static_cast<AsyncTriggerCallbackInfo *>(data);
     asyncCallbackInfo->triggerObj->SetCallbackInfo(env, asyncCallbackInfo->callback[0]);
     asyncCallbackInfo->triggerObj->SetWantAgentInstance(asyncCallbackInfo->wantAgent);
-    WantAgentHelper::TriggerWantAgent(asyncCallbackInfo->context,
-        asyncCallbackInfo->wantAgent,
+    WantAgentHelper::TriggerWantAgent(asyncCallbackInfo->wantAgent,
         asyncCallbackInfo->triggerObj,
         asyncCallbackInfo->triggerInfo);
 };
@@ -892,15 +891,6 @@ napi_value NAPI_Trigger(napi_env env, napi_callback_info info)
         return NapiGetNull(env);
     }
 
-    // Get context
-    napi_value global = nullptr;
-    NAPI_CALL(env, napi_get_global(env, &global));
-    napi_value abilityObj = nullptr;
-    NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj));
-    Ability *ability = nullptr;
-    NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability));
-    std::shared_ptr<OHOS::AppExecFwk::Context> context = ability->GetContext();
-
     bool callBackMode = false;
     if (argc >= NUMBER_OF_PARAMETERS_THREE) {
         napi_valuetype valuetype;
@@ -924,7 +914,6 @@ napi_value NAPI_Trigger(napi_env env, napi_callback_info info)
         return NapiGetNull(env);
     }
     asyncCallbackInfo->wantAgent = std::make_shared<Notification::WantAgent::WantAgent>(*pWantAgent);
-    asyncCallbackInfo->context = context;
     asyncCallbackInfo->triggerInfo = triggerInfo;
     asyncCallbackInfo->triggerObj = nullptr;
     if (callBackMode) {
@@ -1296,15 +1285,6 @@ napi_value NAPI_GetWantAgent(napi_env env, napi_callback_info info)
         return NapiGetNull(env);
     }
 
-    // Get context
-    napi_value global = 0;
-    NAPI_CALL(env, napi_get_global(env, &global));
-    napi_value abilityObj = 0;
-    NAPI_CALL(env, napi_get_named_property(env, global, "ability", &abilityObj));
-    Ability *ability = nullptr;
-    NAPI_CALL(env, napi_get_value_external(env, abilityObj, (void **)&ability));
-    std::shared_ptr<OHOS::AppExecFwk::Context> context = ability->GetContext();
-
     bool callBackMode = false;
     if (argc >= NUMBER_OF_PARAMETERS_TWO) {
         napi_valuetype valuetype;
@@ -1327,7 +1307,7 @@ napi_value NAPI_GetWantAgent(napi_env env, napi_callback_info info)
     asyncCallbackInfo->requestCode = requestCode;
     asyncCallbackInfo->wantAgentFlags = wantAgentFlags;
     asyncCallbackInfo->extraInfo.reset(new (std::nothrow) AAFwk::WantParams(extraInfo));
-    asyncCallbackInfo->context = context;
+    asyncCallbackInfo->context = OHOS::AbilityRuntime::Context::GetApplicationContext();
 
     if (callBackMode) {
         napi_create_reference(env, argv[1], 1, &asyncCallbackInfo->callback[0]);
diff --git a/interfaces/kits/napi/wantagent/napi_want_agent.h b/interfaces/kits/napi/wantagent/napi_want_agent.h
index 6a33753c74fbd69aca90b09173abbe6de6bbc7e5..76c87aba22b10572de2c25c51113c24409a0b86c 100644
--- a/interfaces/kits/napi/wantagent/napi_want_agent.h
+++ b/interfaces/kits/napi/wantagent/napi_want_agent.h
@@ -23,7 +23,7 @@
 
 #include "ability.h"
 #include "completed_callback.h"
-#include "context.h"
+#include "context/context.h"
 #include "napi/native_common.h"
 #include "napi/native_node_api.h"
 #include "trigger_info.h"
@@ -60,7 +60,7 @@ struct AsyncGetWantAgentCallbackInfo {
     int32_t requestCode = -1;
     std::vector<Notification::WantAgent::WantAgentConstant::Flags> wantAgentFlags;
     std::shared_ptr<AAFwk::WantParams> extraInfo;
-    std::shared_ptr<AppExecFwk::Context> context;
+    std::shared_ptr<AbilityRuntime::Context> context;
     std::shared_ptr<Notification::WantAgent::WantAgent> wantAgent;
 };
 
@@ -116,7 +116,6 @@ struct AsyncTriggerCallbackInfo {
     napi_ref callback[2] = {0};
     bool callBackMode = false;
     std::shared_ptr<TriggerCompleteCallBack> triggerObj;
-    std::shared_ptr<AppExecFwk::Context> context;
     std::shared_ptr<Notification::WantAgent::WantAgent> wantAgent;
     Notification::WantAgent::TriggerInfo triggerInfo;
 };
diff --git a/services/ans/src/advanced_notification_service.cpp b/services/ans/src/advanced_notification_service.cpp
index 9c5bc5a09354c2c011829e418e764fceea5d8961..209299a090cc9795aed74eb6a1180eb6831c8eac 100644
--- a/services/ans/src/advanced_notification_service.cpp
+++ b/services/ans/src/advanced_notification_service.cpp
@@ -2786,9 +2786,8 @@ void AdvancedNotificationService::TriggerRemoveWantAgent(const sptr<Notification
         return;
     }
     OHOS::Notification::WantAgent::TriggerInfo triggerInfo;
-    std::shared_ptr<AppExecFwk::Context> context = std::make_shared<OHOS::AppExecFwk::AbilityContext>();
     std::shared_ptr<WantAgent::WantAgent> agent = request->GetRemovalWantAgent();
-    WantAgent::WantAgentHelper::TriggerWantAgent(context, agent, nullptr, triggerInfo);
+    WantAgent::WantAgentHelper::TriggerWantAgent(agent, nullptr, triggerInfo);
 }
 }  // namespace Notification
 }  // namespace OHOS
\ No newline at end of file
diff --git a/test/resource/notificationfuzztest/include/notificationgetparam.h b/test/resource/notificationfuzztest/include/notificationgetparam.h
index 80aa444cd6204b93ce1a9a39c31760041e79d3b2..1b7a14b7d26024c6e8a4c630ec49ff9c022a7c5c 100644
--- a/test/resource/notificationfuzztest/include/notificationgetparam.h
+++ b/test/resource/notificationfuzztest/include/notificationgetparam.h
@@ -88,7 +88,6 @@ sptr<IRemoteObject> GetParamSptrRemote();
 std::shared_ptr<OHOS::AppExecFwk::EventRunner> GetParamEventRunner();
 std::shared_ptr<OHOS::AppExecFwk::Ability> GetParamAbility();
 std::shared_ptr<OHOS::AAFwk::WantParams> GetParamWantParams();
-std::shared_ptr<OHOS::AppExecFwk::Context> GetParamContext();
 OHOS::AppExecFwk::ApplicationFlag GetParamApplicationFlag();
 OHOS::AppExecFwk::ApplicationInfo GetParamApplicationInfo();
 OHOS::AppExecFwk::AbilityInfo GetParamAbilityInfo();
diff --git a/test/resource/notificationfuzztest/src/notificationfuzztestmanager.cpp b/test/resource/notificationfuzztest/src/notificationfuzztestmanager.cpp
index 45eba385ca67a00db0318df88bb9b39056622a5e..01bdfbd97fa03799712e4509ef5dce7910c4c818 100644
--- a/test/resource/notificationfuzztest/src/notificationfuzztestmanager.cpp
+++ b/test/resource/notificationfuzztest/src/notificationfuzztestmanager.cpp
@@ -510,7 +510,7 @@ void NotificationFuzzTestManager::RegisterNotificationSubscriber()
 void NotificationFuzzTestManager::RegisterWantAgentHelper()
 {
     callFunctionMap_.emplace("WantAgentHelperGetWantAgentAppExecFwkparamsInfo", []() {
-        const std::shared_ptr<OHOS::AppExecFwk::Context> context = GetParamContext();
+        std::shared_ptr<AbilityRuntime::Context> context = OHOS::AbilityRuntime::Context::GetApplicationContext();
         const OHOS::Notification::WantAgent::WantAgentInfo paramsInfo = *GetParamWantAgentInfo();
         OHOS::Notification::WantAgent::WantAgentHelper::GetWantAgent(context, paramsInfo);
     });
@@ -526,11 +526,10 @@ void NotificationFuzzTestManager::RegisterWantAgentHelper()
     });
 
     callFunctionMap_.emplace("WantAgentHelperTriggerWantAgent", []() {
-        const std::shared_ptr<AppExecFwk::Context> context;
         const std::shared_ptr<OHOS::Notification::WantAgent::WantAgent> agent = GetParamWantAgent();
         const std::shared_ptr<OHOS::Notification::WantAgent::CompletedCallback> callback = GetParamCompletedCallback();
         OHOS::Notification::WantAgent::TriggerInfo paramsInfo(*GetParamTriggerInfo());
-        OHOS::Notification::WantAgent::WantAgentHelper::TriggerWantAgent(context, agent, callback, paramsInfo);
+        OHOS::Notification::WantAgent::WantAgentHelper::TriggerWantAgent(agent, callback, paramsInfo);
     });
 
     callFunctionMap_.emplace("WantAgentHelperCancel", []() {
@@ -684,105 +683,6 @@ void NotificationFuzzTestManager::RegisterAbilityContext()
     });
 }
 
-// RegisterContext
-void NotificationFuzzTestManager::RegisterContext()
-{
-    callFunctionMap_.emplace("ContextVerifyPermission", []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        const std::string permission = GetStringParam();
-        int pid = GetIntParam();
-        int uid = GetIntParam();
-        temp->VerifyPermission(permission, pid, uid);
-    });
-
-    callFunctionMap_.emplace("ContextVerifyCallingPermission", []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        const std::string permission = GetStringParam();
-        temp->VerifyCallingPermission(permission);
-    });
-
-    callFunctionMap_.emplace("ContextVerifySelfPermission", []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        const std::string permission = GetStringParam();
-        temp->VerifySelfPermission(permission);
-    });
-
-    callFunctionMap_.emplace("ContextVerifyCallingOrSelfPermission", []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        temp->VerifyCallingOrSelfPermission(GetStringParam());
-    });
-
-    callFunctionMap_["ContextCanRequestPermission"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        const std::string permission = GetStringParam();
-        temp->CanRequestPermission(permission);
-    };
-
-    callFunctionMap_["ContextRequestPermissionsFromUser"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        std::vector<std::string> permissions = GetStringVectorParam();
-        int requestCode = GetIntParam();
-        temp->RequestPermissionsFromUser(permissions, requestCode);
-    };
-
-    callFunctionMap_["ContextMoveMissionToEnd"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        bool nonFirst = GetBoolParam();
-        temp->MoveMissionToEnd(nonFirst);
-    };
-
-    callFunctionMap_["ContextSetMissionInformation"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        const MissionInformation missionInformation = GetParamMissionInformation();
-        temp->SetMissionInformation(missionInformation);
-    };
-
-    callFunctionMap_["ContextSetLockMission"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        temp->LockMission();
-    };
-
-    callFunctionMap_["ContextUnlockMission"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        temp->UnlockMission();
-    };
-
-    callFunctionMap_["ContextGetMissionId"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        temp->GetMissionId();
-    };
-
-    callFunctionMap_["ContextGetUITaskDispatcher"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        temp->GetUITaskDispatcher();
-    };
-
-    callFunctionMap_["ContextGetMainTaskDispatcher"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        temp->GetMainTaskDispatcher();
-    };
-
-    callFunctionMap_["ContextCreateParallelTaskDispatcher"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        const std::string name = GetStringParam();
-        const TaskPriority priority = GetParamTaskPriority();
-        temp->CreateParallelTaskDispatcher(name, priority);
-    };
-
-    callFunctionMap_["ContextCreateSerialTaskDispatcher"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        const std::string name = GetStringParam();
-        const TaskPriority priority = GetParamTaskPriority();
-        temp->CreateSerialTaskDispatcher(name, priority);
-    };
-
-    callFunctionMap_["ContextGetGlobalTaskDispatcher"] = []() {
-        std::shared_ptr<OHOS::AppExecFwk::Context> temp = GetParamContext();
-        const TaskPriority priority = GetParamTaskPriority();
-        temp->GetGlobalTaskDispatcher(priority);
-    };
-}
-
 // RegisterAbilityLifecycleCallbacks
 void NotificationFuzzTestManager::RegisterAbilityLifecycleCallbacks()
 {
@@ -876,7 +776,7 @@ void NotificationFuzzTestManager::StartFuzzTest()
             it = remainderMap_.erase(it);
         } else {
             index.push_back(it->first);
-            it++;
+            ++it;
         }
     }
 
diff --git a/test/resource/notificationfuzztest/src/notificationgetparam.cpp b/test/resource/notificationfuzztest/src/notificationgetparam.cpp
index 29b8d46e05d760240a7b8de929ba361094a47298..a1c6578aad73516e5960317ffa5f28395ca5563f 100644
--- a/test/resource/notificationfuzztest/src/notificationgetparam.cpp
+++ b/test/resource/notificationfuzztest/src/notificationgetparam.cpp
@@ -449,11 +449,6 @@ std::shared_ptr<OHOS::AppExecFwk::Ability> GetParamAbility()
     return make_shared<OHOS::AppExecFwk::Ability>();
 }
 
-std::shared_ptr<OHOS::AppExecFwk::Context> GetParamContext()
-{
-    return make_shared<OHOS::AppExecFwk::Ability>();
-}
-
 std::shared_ptr<OHOS::AAFwk::WantParams> GetParamWantParams()
 {
     return make_shared<OHOS::AAFwk::WantParams>();