From 230f13b0ca2f26dbf85c25e96b8e2d8e6715f8fb Mon Sep 17 00:00:00 2001
From: hanhaibin <hanhaibin@huawei.com>
Date: Sat, 29 Jan 2022 21:18:21 +0800
Subject: [PATCH] Change the way to get bundle information

Signed-off-by: hanhaibin <hanhaibin@huawei.com>
---
 frameworks/kits/appkit/BUILD.gn                        |  1 +
 .../native/ability_delegator/src/ability_delegator.cpp |  2 --
 interfaces/kits/napi/BUILD.gn                          |  2 +-
 .../kits/napi/aafwk/app/ability_delegator/BUILD.gn     |  2 +-
 services/abilitymgr/src/ability_manager_service.cpp    | 10 +++++++---
 services/abilitymgr/src/ability_manager_stub.cpp       |  1 +
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/frameworks/kits/appkit/BUILD.gn b/frameworks/kits/appkit/BUILD.gn
index e6700a94347..d91dfff8a08 100644
--- a/frameworks/kits/appkit/BUILD.gn
+++ b/frameworks/kits/appkit/BUILD.gn
@@ -141,6 +141,7 @@ ohos_shared_library("appkit_native") {
     "${aafwk_path}/frameworks/kits/appkit/native/app/src/sys_mgr_client.cpp",
     "${aafwk_path}/frameworks/kits/appkit/native/app/src/watchdog.cpp",
     "//foundation/aafwk/standard/tools/aa/src/shell_command_result.cpp",
+    "//foundation/aafwk/standard/tools/aa/src/test_observer_proxy.cpp",
   ]
   cflags = []
   if (target_cpu == "arm") {
diff --git a/frameworks/kits/appkit/native/ability_delegator/src/ability_delegator.cpp b/frameworks/kits/appkit/native/ability_delegator/src/ability_delegator.cpp
index d6df6d49117..21267103094 100644
--- a/frameworks/kits/appkit/native/ability_delegator/src/ability_delegator.cpp
+++ b/frameworks/kits/appkit/native/ability_delegator/src/ability_delegator.cpp
@@ -240,8 +240,6 @@ void AbilityDelegator::OnRun()
     APP_LOGI("Call TestRunner::Run(), Start run");
     testRunner_->Run();
     APP_LOGI("Run finished");
-
-    FinishUserTest(0);
 }
 
 bool AbilityDelegator::DoAbilityForeground(const sptr<IRemoteObject> &token)
diff --git a/interfaces/kits/napi/BUILD.gn b/interfaces/kits/napi/BUILD.gn
index f38342d2692..56167c6d2ad 100644
--- a/interfaces/kits/napi/BUILD.gn
+++ b/interfaces/kits/napi/BUILD.gn
@@ -19,7 +19,7 @@ group("napi_packages") {
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/abilityManager:abilitymanager",
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/ability_context:abilitycontext_napi",
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/ability_manager:abilitymanager_napi",
-    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/ability_delegator:abilityDelegatorRegistry",
+    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/ability_delegator:abilitydelegatorregistry",
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/ability_stage:abilitystage_napi",
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/ability_stage_context:abilitystagecontext_napi",
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/app/appMgr:napi_app_mgr",
diff --git a/interfaces/kits/napi/aafwk/app/ability_delegator/BUILD.gn b/interfaces/kits/napi/aafwk/app/ability_delegator/BUILD.gn
index 8d8eb3639cf..da7a4cbcaaf 100644
--- a/interfaces/kits/napi/aafwk/app/ability_delegator/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/app/ability_delegator/BUILD.gn
@@ -13,7 +13,7 @@
 
 import("//build/ohos.gni")
 
-ohos_shared_library("abilityDelegatorRegistry") {
+ohos_shared_library("abilitydelegatorregistry") {
   include_dirs = [
     "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common/",
     "//foundation/communication/ipc/ipc/native/src/napi/include/",
diff --git a/services/abilitymgr/src/ability_manager_service.cpp b/services/abilitymgr/src/ability_manager_service.cpp
index ee1f96c7313..1e13b982ce2 100644
--- a/services/abilitymgr/src/ability_manager_service.cpp
+++ b/services/abilitymgr/src/ability_manager_service.cpp
@@ -3975,9 +3975,13 @@ int AbilityManagerService::StartUserTest(const Want &want, const sptr<IRemoteObj
     auto bms = GetBundleManager();
     CHECK_POINTER_AND_RETURN(bms, START_USER_TEST_FAIL);
     AppExecFwk::BundleInfo bundleInfo;
-    if (!bms->GetBundleInfo(bundleName, AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT, bundleInfo)) {
-        HILOG_ERROR("Failed to get bundle info.");
-        return GET_BUNDLE_INFO_FAILED;
+    if (!bms->GetBundleInfo(bundleName, AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT, bundleInfo, U0_USER_ID)) {
+        HILOG_ERROR("Failed to get bundle info by U0_USER_ID %{public}d.", U0_USER_ID);
+        int32_t userId = GetUserId();
+        if (!bms->GetBundleInfo(bundleName, AppExecFwk::BundleFlag::GET_BUNDLE_DEFAULT, bundleInfo, GetUserId())) {
+            HILOG_ERROR("Failed to get bundle info by userId %{public}d.", userId);
+            return GET_BUNDLE_INFO_FAILED;
+        }
     }
 
     int ret = KillProcess(bundleName);
diff --git a/services/abilitymgr/src/ability_manager_stub.cpp b/services/abilitymgr/src/ability_manager_stub.cpp
index 29e49f39f90..d9c23205e6e 100644
--- a/services/abilitymgr/src/ability_manager_stub.cpp
+++ b/services/abilitymgr/src/ability_manager_stub.cpp
@@ -31,6 +31,7 @@ AbilityManagerStub::AbilityManagerStub()
 {
     FirstStepInit();
     SecondStepInit();
+    ThirdStepInit();
 }
 
 AbilityManagerStub::~AbilityManagerStub()
-- 
Gitee