From 32df5807019c8f00c88984b845478415086fe5e8 Mon Sep 17 00:00:00 2001
From: zhoushicheng <zhoushicheng2@huawei.com>
Date: Tue, 9 Aug 2022 19:36:44 +0800
Subject: [PATCH 1/2] IssueNo:#I5LB0C

Signed-off-by: zhoushicheng <zhoushicheng2@huawei.com>
Change-Id: I4dbe182184ae8caa2c00c336d9643c02d69bf7f7
---
 frameworks/js/napi/app/app_manager/js_app_manager.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frameworks/js/napi/app/app_manager/js_app_manager.cpp b/frameworks/js/napi/app/app_manager/js_app_manager.cpp
index 97af3a4be1..2e8e4a21aa 100644
--- a/frameworks/js/napi/app/app_manager/js_app_manager.cpp
+++ b/frameworks/js/napi/app/app_manager/js_app_manager.cpp
@@ -122,6 +122,7 @@ public:
 private:
     sptr<OHOS::AppExecFwk::IAppMgr> appManager_ = nullptr;
     sptr<OHOS::AAFwk::IAbilityManager> abilityManager_ = nullptr;
+    sptr<JSApplicationStateObserver> observer = nullptr;
 
     NativeValue* OnRegisterApplicationStateObserver(NativeEngine& engine, NativeCallbackInfo& info)
     {
@@ -138,7 +139,9 @@ private:
         static int64_t serialNumber = 0;
         std::vector<std::string> bundleNameList;
         // unwarp observer
-        sptr<JSApplicationStateObserver> observer = new JSApplicationStateObserver(engine);
+        if (observer == nullptr) {
+            observer = new JSApplicationStateObserver(engine);
+        }
         observer->SetJsObserverObject(info.argv[INDEX_ZERO]);
         if (info.argc == ARGC_TWO) {
             AppExecFwk::UnwrapArrayStringFromJS(reinterpret_cast<napi_env>(&engine),

From 7550dae2758ba4aec9a0773eb66b94cedf87f72d Mon Sep 17 00:00:00 2001
From: zhoushicheng <zhoushicheng2@huawei.com>
Date: Thu, 11 Aug 2022 18:07:31 +0800
Subject: [PATCH 2/2] IssueNo:#I5LTVG

Signed-off-by: zhoushicheng <zhoushicheng2@huawei.com>
Change-Id: I46199b1274903bbe4e05da1eb98a99480980b9b1
---
 bundle.json                                           | 7 ++++++-
 frameworks/js/napi/app/app_manager/js_app_manager.cpp | 5 +----
 tools/bundle.json                                     | 4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bundle.json b/bundle.json
index 34f4b18492..d5d379eb6a 100644
--- a/bundle.json
+++ b/bundle.json
@@ -12,7 +12,12 @@
   "component": {
       "name": "ability_runtime",
       "subsystem": "ability",
-      "syscap": [],
+      "syscap": [
+        "SystemCapability.Ability.AbilityRuntime.Core",
+        "SystemCapability.Ability.AbilityRuntime.FAModel",
+        "SystemCapability.Ability.AbilityRuntime.AbilityCore",
+        "SystemCapability.Ability.AbilityRuntime.Mission"
+      ],
       "features": [
         "ability_runtime_graphics",
         "ability_runtime_power"
diff --git a/frameworks/js/napi/app/app_manager/js_app_manager.cpp b/frameworks/js/napi/app/app_manager/js_app_manager.cpp
index 2e8e4a21aa..97af3a4be1 100644
--- a/frameworks/js/napi/app/app_manager/js_app_manager.cpp
+++ b/frameworks/js/napi/app/app_manager/js_app_manager.cpp
@@ -122,7 +122,6 @@ public:
 private:
     sptr<OHOS::AppExecFwk::IAppMgr> appManager_ = nullptr;
     sptr<OHOS::AAFwk::IAbilityManager> abilityManager_ = nullptr;
-    sptr<JSApplicationStateObserver> observer = nullptr;
 
     NativeValue* OnRegisterApplicationStateObserver(NativeEngine& engine, NativeCallbackInfo& info)
     {
@@ -139,9 +138,7 @@ private:
         static int64_t serialNumber = 0;
         std::vector<std::string> bundleNameList;
         // unwarp observer
-        if (observer == nullptr) {
-            observer = new JSApplicationStateObserver(engine);
-        }
+        sptr<JSApplicationStateObserver> observer = new JSApplicationStateObserver(engine);
         observer->SetJsObserverObject(info.argv[INDEX_ZERO]);
         if (info.argc == ARGC_TWO) {
             AppExecFwk::UnwrapArrayStringFromJS(reinterpret_cast<napi_env>(&engine),
diff --git a/tools/bundle.json b/tools/bundle.json
index 549d0ae5e1..128e2b03a6 100644
--- a/tools/bundle.json
+++ b/tools/bundle.json
@@ -12,7 +12,9 @@
     "component": {
         "name": "ability_tools",
         "subsystem": "ability",
-        "syscap": [],
+        "syscap": [
+            "SystemCapability.Ability.AbilityTools.AbilityAssistant"
+        ],
         "features": [],
         "adapted_system_type": [
             "standard"