diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp
index 88337ec48340121277eafc3165d06792297ee5c9..d770bb2007d2271d591b4a68abff037d395c31a1 100755
--- a/frameworks/kits/ability/native/src/ability.cpp
+++ b/frameworks/kits/ability/native/src/ability.cpp
@@ -71,6 +71,8 @@ const std::string Ability::DMS_SESSION_ID("sessionId");
 const std::string Ability::DMS_ORIGIN_DEVICE_ID("deviceId");
 const int Ability::DEFAULT_DMS_SESSION_ID(0);
 const std::string PERMISSION_REQUIRE_FORM = "ohos.permission.REQUIRE_FORM";
+const std::string LAUNCHER_BUNDLE_NAME = "com.ohos.launcher";
+const std::string LAUNCHER_ABILITY_NAME = "com.ohos.launcher.MainAbility";
 const int TARGET_VERSION_THRESHOLDS = 8;
 
 static std::mutex formLock;
@@ -194,6 +196,10 @@ void Ability::OnStart(const Want &want)
             winType = Rosen::WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW;
         }
 
+        if (abilityInfo_->bundleName == LAUNCHER_BUNDLE_NAME && abilityInfo_->name == LAUNCHER_ABILITY_NAME) {
+            winType = Rosen::WindowType::WINDOW_TYPE_WALLPAPER;
+        }
+
         int defualtDisplayId = Rosen::WindowScene::DEFAULT_DISPLAY_ID;
         int displayId = want.GetIntParam(StartOptions::STRING_DISPLAY_ID, defualtDisplayId);
         APP_LOGI("Ability::OnStart bundleName:%{public}s, abilityName:%{public}s, config.type:%{public}d, "
diff --git a/services/abilitymgr/BUILD.gn b/services/abilitymgr/BUILD.gn
old mode 100644
new mode 100755
index b30fa110e49b89727a117719fcfebdc76d9d5171..fe23fbd127693eb66bbb6faf4218bd4895774b2e
--- a/services/abilitymgr/BUILD.gn
+++ b/services/abilitymgr/BUILD.gn
@@ -100,6 +100,7 @@ ohos_shared_library("abilityms") {
     "bytrace_standard:bytrace_core",
     "ces_standard:cesfwk_core",
     "ces_standard:cesfwk_innerkits",
+    "device_manager_base:devicemanagersdk",
     "dsoftbus_standard:softbus_client",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
diff --git a/services/abilitymgr/include/mission_list_manager.h b/services/abilitymgr/include/mission_list_manager.h
old mode 100644
new mode 100755
index 331dbbdb5a4e2299a0c39399c18228b490c9546e..dc2d2d1153c241a10794bea55c73a6931083fb1c
--- a/services/abilitymgr/include/mission_list_manager.h
+++ b/services/abilitymgr/include/mission_list_manager.h
@@ -21,6 +21,7 @@
 #include <memory>
 
 #include "ability_running_info.h"
+#include "foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp/include/device_manager.h"
 #include "mission_list.h"
 #include "mission_listener_controller.h"
 #include "mission_info.h"
@@ -310,6 +311,7 @@ private:
     void HandleAbilityDiedByDefault(std::shared_ptr<AbilityRecord> abilityRecord);
     void DelayedStartLauncher();
     void BackToLauncher();
+    bool IsPC();
 
 private:
     int userId_;
@@ -325,6 +327,16 @@ private:
 
     std::queue<AbilityRequest> waittingAbilityQueue_;
     std::shared_ptr<MissionListenerController> listenerController_;
+    bool isPC_ = false;
+
+private:
+class MissionDmInitCallback : public DistributedHardware::DmInitCallback {
+public:
+    void OnRemoteDied() override;
+
+public:
+    static bool isInit_;
+};
 };
 }  // namespace AAFwk
 }  // namespace OHOS
diff --git a/services/abilitymgr/src/mission_list_manager.cpp b/services/abilitymgr/src/mission_list_manager.cpp
old mode 100644
new mode 100755
index 2746ac91b0febe1eeb73d3dfd125b43ac9b75f0c..37629a61bb488df75e6fdfb980a0e02ec7514487
--- a/services/abilitymgr/src/mission_list_manager.cpp
+++ b/services/abilitymgr/src/mission_list_manager.cpp
@@ -225,9 +225,11 @@ int MissionListManager::StartAbilityLocked(const std::shared_ptr<AbilityRecord>
     // 4. move target list to top
     MoveMissionListToTop(targetList);
 
-    // ability is already foreground, process next ability.
-    if (targetAbilityRecord->IsAbilityState(AbilityState::FOREGROUND_NEW) ||
-        targetAbilityRecord->IsAbilityState(AbilityState::FOREGROUNDING_NEW)) {
+    // ability is already foreground, process next ability, excepting for launcher's MainAbility.
+    if ((abilityRequest.abilityInfo.bundleName != AbilityConfig::LAUNCHER_BUNDLE_NAME ||
+        abilityRequest.abilityInfo.name != AbilityConfig::LAUNCHER_ABILITY_NAME) &&
+        (targetAbilityRecord->IsAbilityState(AbilityState::FOREGROUND_NEW) ||
+        targetAbilityRecord->IsAbilityState(AbilityState::FOREGROUNDING_NEW))) {
         PostStartWaittingAbility();
         return 0;
     }
@@ -845,8 +847,8 @@ int MissionListManager::TerminateAbilityLocked(const std::shared_ptr<AbilityReco
 
 /**
  * @brief This method aims to do things as below
- * 1. remove the mission form the current missionList
- * 2. if the current missionList is empty after, then remove form the manager
+ * 1. remove the mission from the current missionList
+ * 2. if the current missionList is empty after, then remove from the manager
  * 3. if the current ability is foreground, then should schedule the next ability to foreground before terminate
  *
  * @param abilityRecord the ability that was terminating
@@ -874,11 +876,9 @@ void MissionListManager::RemoveTerminatingAbility(const std::shared_ptr<AbilityR
         HILOG_DEBUG("ability state is %{public}d, just return", abilityRecord->GetAbilityState());
         return;
     }
-    // 3. if the launcher is foreground, just background
-    std::shared_ptr<AbilityRecord> launcherRoot = launcherList_->GetLauncherRoot();
-    if (launcherRoot
-        && (launcherRoot->IsAbilityState(FOREGROUND_NEW) || launcherRoot->IsAbilityState(FOREGROUNDING_NEW))) {
-        HILOG_DEBUG("launcherRoot state is %{public}d, no need to schedule next", launcherRoot->GetAbilityState());
+    // 3. if run on a laptop, noting to do
+    if (IsPC()) {
+        HILOG_DEBUG("Run on a laptop, no need to schedule next ability.");
         return;
     }
 
@@ -1506,6 +1506,40 @@ void MissionListManager::DumpMission(int missionId, std::vector<std::string> &in
     innerMissionInfo.Dump(info);
 }
 
+bool MissionListManager::IsPC()
+{
+    if (MissionDmInitCallback::isInit_) {
+        return isPC_;
+    }
+    std::string pkgName = "ohos.aafwk.aafwk_standard";
+    auto callback = std::make_shared<MissionDmInitCallback>();
+    int32_t ret = DistributedHardware::DeviceManager::GetInstance().InitDeviceManager(pkgName, callback);
+    if (ret != ERR_OK) {
+        HILOG_WARN("DeviceManager initialization failed.");
+        return false;
+    }
+    DistributedHardware::DmDeviceInfo deviceInfo;
+    ret = DistributedHardware::DeviceManager::GetInstance().GetLocalDeviceInfo(pkgName, deviceInfo);
+    if (ret != ERR_OK) {
+        HILOG_WARN("Failed to get local device info.");
+        return false;
+    }
+    MissionDmInitCallback::isInit_ = true;
+    if (deviceInfo.deviceTypeId != DistributedHardware::DmDeviceType::DEVICE_TYPE_PC) {
+        HILOG_WARN("The device is not a laptop.");
+        return false;
+    }
+    isPC_ = true;
+    return isPC_;
+}
+
+bool MissionListManager::MissionDmInitCallback::isInit_ = false;
+void MissionListManager::MissionDmInitCallback::OnRemoteDied()
+{
+    isInit_ = false;
+    HILOG_WARN("DeviceManager died.");
+}
+
 void MissionListManager::RegisterSnapshotHandler(const sptr<ISnapshotHandler>& handler)
 {
     DelayedSingleton<MissionInfoMgr>::GetInstance()->RegisterSnapshotHandler(handler);
diff --git a/services/abilitymgr/test/unittest/phone/ability_connect_callback_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_connect_callback_proxy_test/BUILD.gn
old mode 100644
new mode 100755
index 37ad73e8f96b017e405fe47b1b8d6c35ae61da4e..07ff1f13281acfd163f02b8404b0fdb515c4a95a
--- a/services/abilitymgr/test/unittest/phone/ability_connect_callback_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_connect_callback_proxy_test/BUILD.gn
@@ -56,6 +56,7 @@ ohos_unittest("ability_connect_callback_proxy_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "native_appdatamgr:native_appdatafwk",
diff --git a/services/abilitymgr/test/unittest/phone/ability_connect_callback_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_connect_callback_stub_test/BUILD.gn
old mode 100644
new mode 100755
index 8fb042732d8319719c928f4963b93d12cccb4a53..4ffc8c791c80d364df53dcafc0842821d9b17b80
--- a/services/abilitymgr/test/unittest/phone/ability_connect_callback_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_connect_callback_stub_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("ability_connect_callback_stub_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
     "native_appdatamgr:native_appdatafwk",
diff --git a/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn
old mode 100644
new mode 100755
index 9c9b2b9cd09fc28ead50444b52c707375ea240e7..9c4802eae148390dd99888e6e7c624ce30e17c17
--- a/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("ability_connect_manage_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_dump_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_dump_test/BUILD.gn
old mode 100644
new mode 100755
index de1f5a28126c3efc0afd741b329b6e3b61371ddb..f2749a3ec5cf2d4c7ddffadc16d70448954252d2
--- a/services/abilitymgr/test/unittest/phone/ability_dump_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_dump_test/BUILD.gn
@@ -59,6 +59,7 @@ ohos_unittest("ability_dump_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn
old mode 100644
new mode 100755
index 095d037a8e57e7b47c71a12395ab70e36979372a..bc6b6ddcd6dc7254ec361d9555a3bace9f80a83a
--- a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("ability_manager_proxy_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn
old mode 100644
new mode 100755
index 6d449bc22a2b6ae07ee62da4c54d58adf4d8b12b..5f520b9cc536d51306cb4d8d75a115bb8af0ab1e
--- a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn
@@ -57,6 +57,7 @@ ohos_unittest("ability_manager_service_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "dsoftbus_standard:softbus_client",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
diff --git a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn
old mode 100644
new mode 100755
index ee4be35b2dfc227b79b1d6c6624c6da33d32cdc9..1a7cc7da96ce5d95e6a00a43f3af271371c14f76
--- a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("ability_manager_stub_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn
old mode 100644
new mode 100755
index 32d1844caabd029326a7b7cd09c4dd623d728507..c0ac30092e917d942a673a21e7109b7667f87695
--- a/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("ability_record_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn
old mode 100644
new mode 100755
index 33ee48a537411ef54cfdd98615399014e3182a4c..160e365ba04634b385efb92ed874ead149c17f7f
--- a/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("ability_scheduler_proxy_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn
old mode 100644
new mode 100755
index da974991a02ac76f7946179ed2127fdb0679a96f..5bf87200f8584b9a56aba048abc5c7a3cca54446
--- a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("ability_scheduler_stub_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn
old mode 100644
new mode 100755
index 6066274e1a4d845270bca37014b7741f14f61c08..9cb0dbe010fab771f9ab15b9ce9bea1de4bf57e0
--- a/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn
@@ -57,6 +57,7 @@ ohos_unittest("ability_service_start_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn
old mode 100644
new mode 100755
index 5ed561ec3609613f5a9ebaba0256ec98789a6c1f..f1f33ad39726213f93d30e545aacd3dd3f66fd60
--- a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn
@@ -59,6 +59,7 @@ ohos_unittest("ability_stack_manager_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn
old mode 100644
new mode 100755
index 1ff24e62116951f8b78a14459fc2963d60d2cc7c..f4da4767db3ff98d268f2c577bdad9d3e993cce9
--- a/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("ability_token_proxy_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn
old mode 100644
new mode 100755
index 6002fafcbad50b390dee356a5d36d1d9b105dc26..8148d382009bfcf0e4bc71515f884c0826634e8e
--- a/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("ability_token_stub_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn
old mode 100644
new mode 100755
index 08eb166132cf83a05079a651e313afcd548a2b68..2233b8d1e0847e79c7a3b6bf071116531c286f3c
--- a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("ability_with_applications_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn
old mode 100644
new mode 100755
index 865d1eba59a12027b2fef9243876c439c3da80cc..70d33d8a9bb6e851715947cd5df019ec6a6ce9f6
--- a/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("abilityms_appms_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn
old mode 100644
new mode 100755
index 793950db2896d2d596946e446ac1db60c73d662a..556fcf04d5376fd92e5820f0c367a30d3df178b4
--- a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("app_scheduler_test") {
 
   external_deps = [
     "bytrace_standard:bytrace_core",
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn
old mode 100644
new mode 100755
index e66c6ff89b21e542d1e95b2c64e27285142210c0..769540670a2ff298fee680a7fb738c4eb13547a5
--- a/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn
@@ -59,6 +59,7 @@ ohos_unittest("configuration_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn
old mode 100644
new mode 100755
index 914f7657b697e08d1992c42a7f8036a26f7a8a3c..56a39342d62d8b2474d47ea277d1f786d8264688
--- a/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn
@@ -56,6 +56,7 @@ ohos_unittest("connection_record_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn
old mode 100644
new mode 100755
index f96cd272adab10f858b14b2bbeef3c4cd7d2ab6c..c4c197a0d102f1e609c4cc276b6a64e12f8faa6c
--- a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn
@@ -66,6 +66,7 @@ ohos_unittest("data_ability_manager_test") {
 
   external_deps = [
     "bytrace_standard:bytrace_core",
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn
old mode 100644
new mode 100755
index 04b09fa63cd05e22e56718737aee057de535ec88..f9f4ba31f95d6dfdc98a8d616ec9ca6247394b19
--- a/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn
@@ -63,6 +63,7 @@ ohos_unittest("data_ability_record_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn
old mode 100644
new mode 100755
index 53605add2390d17b84682749fead8183597994d6..65c47046200a024f54ce9dcd66fde81bc7767cd5
--- a/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn
@@ -57,6 +57,7 @@ ohos_unittest("info_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/BUILD.gn
old mode 100644
new mode 100755
index 445c61c5baca99828b54c3ba86e424c329e82daf..bc5441aff0d273bc2d359f05891345ac4878a1f0
--- a/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/kernal_system_app_manager_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("kernal_system_app_mgr_test") {
     "//utils/native/base:utils",
   ]
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn
old mode 100644
new mode 100755
index d97b57e27a65ffc359ea0bb66b04fa261fa54298..c06ed48792a835a52e578203204d6dcbd8014cd4
--- a/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn
@@ -58,6 +58,7 @@ ohos_unittest("lifecycle_deal_test") {
 
   external_deps = [
     "appexecfwk_standard:appexecfwk_core",
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn
old mode 100644
new mode 100755
index 9ea108ccee1ad15d41b144b9a0381ad0012827ba..9b3bd994f8f87afc82a4a8a90610a113b6ca6e4d
--- a/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn
@@ -57,6 +57,7 @@ ohos_unittest("lifecycle_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn
old mode 100644
new mode 100755
index d6337a6ea1cb4fb89d71c2a7a58bc263e833ad30..93fbdf28f28b3031a6e4abb30fbc81d220dc94fc
--- a/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/lock_screen_white_list_test/BUILD.gn
@@ -59,6 +59,7 @@ ohos_unittest("lock_screen_white_list_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn
old mode 100644
new mode 100755
index 40c526053c30a7644f128b3594bfe462de3e177a..0f5e4ac9c4c3fb69a3521b58786aaaa5983d4143
--- a/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("mission_list_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn
old mode 100644
new mode 100755
index 0306eb0ace38fd8467e4a0bf90749e29d8df4dde..83a637609e8a90ec1dee2b098ae115a8545b84a8
--- a/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("mission_record_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn
old mode 100644
new mode 100755
index 4e6a9c5c093f64d31fd1037a5380d164ee4ff1fa..cc9c8d44eeb0c27abbc42008bca00a280178a7f3
--- a/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("mission_stack_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn
old mode 100644
new mode 100755
index 9ef8d14a1b63d738794f689fbd9adb474c01b869..e8c47bede1732e5922a6d8b568516a3cb98db5d0
--- a/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("mission_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn
old mode 100644
new mode 100755
index ef1b22976f356fd3a68421408588941d529287c6..58840b4e784f80265a293a2eb15901f5c72f6bb3
--- a/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn
@@ -50,6 +50,7 @@ ohos_unittest("pending_want_key_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn
old mode 100644
new mode 100755
index 770458137d58918d094fd6c4484661c573cda302..a76bcace6cc67882614533343db9cb4c754e7d40
--- a/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn
@@ -54,6 +54,7 @@ ohos_unittest("pending_want_manager_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn
old mode 100644
new mode 100755
index dc8e25a50ee0d43cead0b8171b9be4eed7b10396..b998d5b0e23ea004c96463a075d575b79f918661
--- a/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn
@@ -54,6 +54,7 @@ ohos_unittest("pending_want_record_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn
old mode 100644
new mode 100755
index f5262af69239eb662e9c01dfb5a7753fc7616412..3fe0a0fec74d96747b9dc01136c2085fdf9ef495
--- a/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn
@@ -53,6 +53,7 @@ ohos_unittest("resume_mission_container_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn
old mode 100644
new mode 100755
index 47273c185e73c2eb3a8c08a9ae8a9c348171a05a..149c4269100b3331da9fbc1a99cffbd87ec99c1c
--- a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn
@@ -59,6 +59,7 @@ ohos_unittest("ability_screenshot_handler_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn
old mode 100644
new mode 100755
index 29e60f12338010a383ae774319e8df0232b5c25f..1428878cb429fff75b779e6b81139b3bb72294f9
--- a/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn
@@ -54,6 +54,7 @@ ohos_unittest("sender_info_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn
old mode 100644
new mode 100755
index a25847b0f1d26b75ebb853155f0a8d74d3fad4ca..32e13b01062043fb35d53053736372e7e7b54471
--- a/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn
@@ -59,6 +59,7 @@ ohos_unittest("terminate_ability_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn
old mode 100644
new mode 100755
index 1ddb2ea80012699561227586d73c813739ce6f39..d988e47731f38564e240fb8e70232910fbcce464
--- a/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("want_receiver_proxy_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn
old mode 100644
new mode 100755
index b6fdcf500361972029fa8162684ccbaa0339d29b..7ba77849a182ac2af3774e3ea637f7da0a5f56a4
--- a/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn
@@ -56,6 +56,7 @@ ohos_unittest("want_receiver_stub_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn
old mode 100644
new mode 100755
index 1cba48b84cf898c96c44500947eab5c2cd324623..73d2c75ba98344a6e2777c0c4ebdf2fabd56b387
--- a/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn
@@ -54,6 +54,7 @@ ohos_unittest("want_sender_info_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn
old mode 100644
new mode 100755
index 5d37c08ac99af62dcc2ef4fda4d349caf98a05db..99b04380a0a76cbbe9e7dd77a3c49f046d6b5daf
--- a/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("want_sender_proxy_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn
old mode 100644
new mode 100755
index 7f63edf2eb614ffef26d930b96a1f9ad5c18eff9..bff4954547e9c57de02414e3a607ca6f14d7fd1d
--- a/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn
@@ -56,6 +56,7 @@ ohos_unittest("want_sender_stub_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn
old mode 100644
new mode 100755
index 2a391855962c28337143679544b573b93c72ecc8..c9997c9f8de7599818c7d9d17871fb3c93038518
--- a/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn
@@ -55,6 +55,7 @@ ohos_unittest("wants_info_test") {
   ]
 
   external_deps = [
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn b/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn
old mode 100644
new mode 100755
index 49dd4c0440218e50c28c8b2c08a13c67ec70fe86..78d4b974a4f69f761180573f5cb64414b9b685f5
--- a/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn
@@ -46,7 +46,10 @@ ohos_unittest("window_info_test") {
     "//utils/native/base:utils",
   ]
 
-  external_deps = [ "hiviewdfx_hilog_native:libhilog" ]
+  external_deps = [
+    "device_manager_base:devicemanagersdk",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
 }
 
 group("unittest") {
diff --git a/services/test/moduletest/dump_module_test/BUILD.gn b/services/test/moduletest/dump_module_test/BUILD.gn
old mode 100644
new mode 100755
index 73b00910693e0cb25a3f60d29661d5911c71a8c4..1f45616f174fb35b4f206758c00aa822ef44023b
--- a/services/test/moduletest/dump_module_test/BUILD.gn
+++ b/services/test/moduletest/dump_module_test/BUILD.gn
@@ -63,6 +63,7 @@ ohos_moduletest("dump_module_test") {
 
   external_deps = [
     "bytrace_standard:bytrace_core",
+    "device_manager_base:devicemanagersdk",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",
   ]
diff --git a/services/test/moduletest/panding_want_manager_test/BUILD.gn b/services/test/moduletest/panding_want_manager_test/BUILD.gn
old mode 100644
new mode 100755
index 5c2d10f4bc9795d4ccc2088e1fb6a33faa3997f8..8e90eaee7edd03ef9a1dcc8aaf1d91d5a1fdc4c8
--- a/services/test/moduletest/panding_want_manager_test/BUILD.gn
+++ b/services/test/moduletest/panding_want_manager_test/BUILD.gn
@@ -71,6 +71,7 @@ ohos_moduletest("PandingWantMgrTest") {
     "bytrace_standard:bytrace_core",
     "ces_standard:cesfwk_core",
     "ces_standard:cesfwk_innerkits",
+    "device_manager_base:devicemanagersdk",
     "dsoftbus_standard:softbus_client",
     "hiviewdfx_hilog_native:libhilog",
     "ipc:ipc_core",