uri component modification

Signed-off-by: majiajun <864428661@qq.com> Change-Id: I70baa1faff3db56f4fc303730eae528f05967049
2024-11-23 15:20:34 +00:00 · 2022-03-03 03:23:40 -08:00 · 2022-03-03 03:23:40 -08:00 · ff00cd1d76
commit ff00cd1d76
parent 27f9f835bb
180 changed files with 1026 additions and 259 deletions
--- a/bundle.json
+++ b/bundle.json
@ -26,7 +26,6 @@
              "ces_standard",
              "device_manager_base",
              "distributeddatamgr_appdatamgr",
-              "distributedschedule_dms_fwk",
              "dsoftbus_standard",
              "form_runtime",
              "hiviewdfx_hilog_native",
--- a/frameworks/kits/ability/native/BUILD.gn
+++ b/frameworks/kits/ability/native/BUILD.gn
@ -23,6 +23,7 @@ config("ability_config") {
    "${SUBSYSTEM_DIR}/include",
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "${INNERKITS_PATH}/want/include/ohos/aafwk/content",
    "${INNERKITS_PATH}/ability_manager/include",
    "//foundation/aafwk/standard/services/abilitymgr/include",
@ -35,7 +36,6 @@ config("ability_config") {
    "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include",
    "//foundation/aafwk/standard/frameworks/kits/app/native/app/include",
    "//foundation/aafwk/standard/services/common/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//base/global/resmgr_standard/interfaces/innerkits/include",
    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/featureAbility",
    "//foundation/ace/napi/interfaces/kits",
@ -254,7 +254,6 @@ ohos_shared_library("abilitykit_native") {
    "//foundation/ace/napi:ace_napi",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
    "//foundation/resourceschedule/background_task_mgr/interfaces/innerkits:bgtaskmgr_innerkits",
@ -263,6 +262,7 @@ ohos_shared_library("abilitykit_native") {

  external_deps = [
    "ability_base:configuration",
+    "ability_base:zuri",
    "ability_runtime:ability_context_native",
    "ability_runtime:app_manager",
    "ability_runtime:napi_base_context",
--- a/frameworks/kits/ability/native/test/BUILD.gn
+++ b/frameworks/kits/ability/native/test/BUILD.gn
@ -23,8 +23,8 @@ config("module_private_config") {
  include_dirs = [
    "//base/global/i18n_standard/frameworks/intl/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content",
-    "//EOSP/communication/libsoftbus/../../../foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content",
    "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include",
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/test/mock/include",
@ -36,7 +36,6 @@ config("module_private_config") {
    "//foundation/aafwk/standard/frameworks/kits/fmskit/native/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/app_distributeddata/include",
    "//foundation/aafwk/standard/frameworks/kits/ability/native/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
@ -61,7 +60,7 @@ config("module_ability_context_config") {
  visibility = [ ":*" ]
  include_dirs = [
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
-    "//EOSP/communication/libsoftbus/../../../foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
    "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include",
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/test/mock/include",
@ -109,11 +108,10 @@ ohos_unittest("ability_test") {
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
-    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/graphic/standard:libwmclient",
    "//third_party/googletest:gmock_main",
@ -409,13 +407,13 @@ ohos_unittest("data_ability_helper_test") {

  deps = [
    "${INNERKITS_PATH}/base:base",
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
@ -438,6 +436,7 @@ ohos_unittest("data_ability_operation_test") {
  configs = [ ":module_private_config" ]

  deps = [
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
@ -448,7 +447,6 @@ ohos_unittest("data_ability_operation_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
@ -477,6 +475,7 @@ ohos_unittest("ability_impl_active_test") {
  configs = [ ":module_private_config" ]

  deps = [
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
@ -488,7 +487,6 @@ ohos_unittest("ability_impl_active_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
@ -514,6 +512,7 @@ ohos_unittest("ability_impl_test") {
  configs = [ ":module_private_config" ]

  deps = [
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/i18n_standard/frameworks/intl:intl_util",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
@ -527,7 +526,6 @@ ohos_unittest("ability_impl_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-common",
    "//third_party/googletest:gtest_main",
@ -557,7 +555,6 @@ ohos_unittest("ability_thread_test") {
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h",
    "mock/include/mock_ability_manager_client.cpp",
    "mock/include/sys_mgr_client_mock.cpp",
    "unittest/ability_thread_test.cpp",
@ -566,6 +563,7 @@ ohos_unittest("ability_thread_test") {
  configs = [ ":module_private_config" ]

  deps = [
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
@ -578,7 +576,6 @@ ohos_unittest("ability_thread_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/graphic/standard:libwmclient",
    "//third_party/googletest:gtest_main",
@ -649,7 +646,6 @@ ohos_unittest("data_ability_impl_test") {
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h",
    "unittest/data_ability_impl_test.cpp",
  ]

@ -657,6 +653,7 @@ ohos_unittest("data_ability_impl_test") {

  deps = [
    "${INNERKITS_PATH}/base:base",
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
@ -668,7 +665,6 @@ ohos_unittest("data_ability_impl_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/graphic/standard:libwmclient",
    "//third_party/googletest:gtest_main",
@ -697,7 +693,6 @@ ohos_unittest("data_ability_impl_file_secondpart_test") {
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h",
    "unittest/data_ability_impl_file_secondpart_test.cpp",
  ]

@ -705,6 +700,7 @@ ohos_unittest("data_ability_impl_file_secondpart_test") {

  deps = [
    "${INNERKITS_PATH}/base:base",
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
@ -716,7 +712,6 @@ ohos_unittest("data_ability_impl_file_secondpart_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/graphic/standard:libwmclient",
    "//third_party/googletest:gtest_main",
@ -745,7 +740,6 @@ ohos_unittest("data_ability_impl_file_test") {
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h",
    "unittest/data_ability_impl_file_test.cpp",
  ]

@ -753,6 +747,7 @@ ohos_unittest("data_ability_impl_file_test") {

  deps = [
    "${INNERKITS_PATH}/base:base",
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
@ -764,7 +759,6 @@ ohos_unittest("data_ability_impl_file_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/graphic/standard:libwmclient",
    "//third_party/googletest:gtest_main",
@ -793,7 +787,6 @@ ohos_unittest("ability_thread_dataability_test") {
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/app/src/ohos_application.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/configuration.cpp",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/src/appmgr/process_info.cpp",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h",
    "mock/include/mock_ability_manager_client.cpp",
    "mock/include/sys_mgr_client_mock.cpp",
    "unittest/ability_thread_dataability_test.cpp",
@ -802,6 +795,7 @@ ohos_unittest("ability_thread_dataability_test") {
  configs = [ ":module_private_config" ]

  deps = [
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
@ -814,7 +808,6 @@ ohos_unittest("ability_thread_dataability_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/graphic/standard:libwmclient",
    "//third_party/googletest:gtest_main",
@ -856,16 +849,15 @@ ohos_unittest("data_uri_utils_test") {
  sources = [
    "//foundation/aafwk/standard/frameworks/kits/ability/native/src/data_uri_utils.cpp",
    "//foundation/aafwk/standard/frameworks/kits/ability/native/test/unittest/data_uri_utils_test.cpp",
-    "//foundation/distributedschedule/dmsfwk/utils/native/source/uri.cpp",
  ]

  deps = [
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
  ]
@ -988,8 +980,8 @@ ohos_unittest("data_ability_result_test") {

  deps = [
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
  ]

@ -1058,6 +1050,7 @@ ohos_unittest("continuation_test") {
  configs = [ ":module_private_config" ]

  deps = [
+    "${INNERKITS_PATH}/uri:zuri",
    "${INNERKITS_PATH}/want:want",
    "//base/global/resmgr_standard/frameworks/resmgr:global_resmgr",
    "//foundation/aafwk/standard/common/task_dispatcher:task_dispatcher",
@ -1069,7 +1062,6 @@ ohos_unittest("continuation_test") {
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
--- a/frameworks/kits/ability/native/test/unittest/ability_impl_active_test.cpp
+++ b/frameworks/kits/ability/native/test/unittest/ability_impl_active_test.cpp
@ -21,7 +21,6 @@
 #include "ability_state.h"
 #include "app_log_wrapper.h"
 #include "context_deal.h"
-#include "foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h"
 #include "mock_ability_token.h"
 #include "ohos_application.h"
 #include "page_ability_impl.h"
@ -351,4 +350,4 @@ HWTEST_F(AbilityImplActiveTest, AaFwk_AbilityImpl_InActive_003, TestSize.Level1)
 }

 }  // namespace AppExecFwk
-}  // namespace OHOS
+}  // namespace OHOS
--- a/frameworks/kits/ability/native/test/unittest/ability_impl_test.cpp
+++ b/frameworks/kits/ability/native/test/unittest/ability_impl_test.cpp
@ -20,7 +20,6 @@
 #include "ability_state.h"
 #include "app_log_wrapper.h"
 #include "context_deal.h"
-#include "foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h"
 #include "mock_ability_token.h"
 #include "mock_page_ability.h"
 #include "mock_ability_impl.h"
@ -31,6 +30,7 @@

 #include "abs_shared_result_set.h"
 #include "data_ability_predicates.h"
+#include "uri.h"
 #include "values_bucket.h"

 namespace OHOS {
--- a/frameworks/kits/ability/native/test/unittest/continuation_test.cpp
+++ b/frameworks/kits/ability/native/test/unittest/continuation_test.cpp
@ -24,7 +24,6 @@
 #include "continuation_manager.h"
 #include "continuation_handler.h"
 #include "data_ability_predicates.h"
-#include "foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h"
 #include "mock_ability_impl.h"
 #include "mock_ability_lifecycle_callbacks.h"
 #include "mock_ability_token.h"
@ -205,4 +204,4 @@ HWTEST_F(ContinuationTest, continue_handler_start_continue_002, TestSize.Level1)
    GTEST_LOG_(INFO) << "continue_handler_start_continue_002 end";
 }
 }  // namespace AppExecFwk
-}  // namespace OHOS
+}  // namespace OHOS
--- a/frameworks/kits/appkit/BUILD.gn
+++ b/frameworks/kits/appkit/BUILD.gn
@ -53,13 +53,13 @@ ohos_executable("appexec") {
    "${aafwk_path}/frameworks/kits/ability/native/include",
    "${aafwk_path}/interfaces/innerkits/base/include",
    "${aafwk_path}/interfaces/innerkits/ability_manager/include",
+    "${aafwk_path}/interfaces/innerkits/uri/include",
    "${aafwk_path}/services/abilitymgr/include",
    "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime/app",
    "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime/context",
    "${aafwk_path}/frameworks/kits/appkit/native/app/include",
    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
    "//utils/native/base/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
  ]

@ -89,6 +89,7 @@ ohos_shared_library("appkit_native") {
    "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
    "${appexecfwk_path}/interfaces/innerkits/appexecfwk_base/include",
    "${aafwk_path}/interfaces/innerkits/app_manager/include/appmgr",
+    "${aafwk_path}/interfaces/innerkits/uri/include",
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler/include",
    "${aafwk_path}/frameworks/kits/appkit/native/app/include",
    "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime/app",
@ -98,7 +99,6 @@ ohos_shared_library("appkit_native") {
    "${aafwk_path}/interfaces/innerkits/ability_manager/include",
    "${aafwk_path}/services/abilitymgr/include",
    "//utils/native/base/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "${aafwk_path}/interfaces/innerkits/want/include/ohos/aafwk_L2/content",

    "${aafwk_path}/common/task_dispatcher/include/dispatcher",
@ -153,7 +153,6 @@ ohos_shared_library("appkit_native") {
    "${innerkits_path}/uri_permission:uri_permission_mgr",
    "//base/hiviewdfx/faultloggerd/interfaces/innerkits/dump_catcher:lib_dfx_dump_catcher",
    "//base/hiviewdfx/faultloggerd/interfaces/innerkits/faultloggerd_client:libfaultloggerd",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
    "//third_party/icu/icu4c:shared_icuuc",
@ -166,6 +165,7 @@ ohos_shared_library("appkit_native") {
  ]
  external_deps = [
    "ability_base:configuration",
+    "ability_base:zuri",
    "ability_runtime:runtime",
    "bundle_framework:appexecfwk_core",
    "bytrace_standard:bytrace_core",
@ -216,7 +216,6 @@ ohos_shared_library("app_context") {
    "${aafwk_path}/interfaces/innerkits/ability_manager:ability_manager",
    "${appexecfwk_path}/interfaces/innerkits/libeventhandler:libeventhandler",
    "//base/hiviewdfx/hiview/adapter/utility:hiview_adapter_utility",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimodalinput/input/frameworks/proxy:libmmi-client",
    "//third_party/icu/icu4c:shared_icuuc",
@ -230,6 +229,7 @@ ohos_shared_library("app_context") {
  ]

  external_deps = [
+    "ability_base:zuri",
    "ability_runtime:runtime",
    "bundle_framework:appexecfwk_core",
    "hiviewdfx_hilog_native:libhilog",
--- a/frameworks/kits/appkit/native/test/BUILD.gn
+++ b/frameworks/kits/appkit/native/test/BUILD.gn
@ -24,9 +24,9 @@ config("module_private_config") {
  include_dirs = [
    "${aafwk_path}/frameworks/kits/appkit/native/ability_runtime/context",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include/bundlemgr",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content",
-    "//EOSP/communication/libsoftbus/../../../foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content",
    "${aafwk_path}/frameworks/kits/appkit/native/test/mock/include",
    "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include",
@ -50,8 +50,8 @@ config("module_context_config") {
  visibility = [ ":*" ]
  include_dirs = [
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content",
-    "//EOSP/communication/libsoftbus/../../../foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content",
    "${aafwk_path}/frameworks/kits/appkit/native/test/mock/include",
    "//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include",
--- a/frameworks/kits/appkit/test/BUILD.gn
+++ b/frameworks/kits/appkit/test/BUILD.gn
@ -23,8 +23,8 @@ config("module_private_config") {
  visibility = [ ":*" ]
  include_dirs = [
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/include/appmgr",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk_L2/content",
-    "//EOSP/communication/libsoftbus/../../../foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/aafwk/standard/frameworks/kits/appkit/native/test/mock/include",

    #"//foundation/aafwk/standard/frameworks/kits/ability/native/test/mock/include",
--- a/frameworks/kits/content/cpp/test/BUILD.gn
+++ b/frameworks/kits/content/cpp/test/BUILD.gn
@ -21,6 +21,7 @@ config("module_private_config") {
  include_dirs = [
    "//utils/native/base/include",
    "//sdk/appexecfwk/appexecfwk_base/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include",
    "//foundation/aafwk/standard/interfaces/innerkits/intent/include",
    "//foundation/appexecfwk/standard/common/log/include",
@ -183,7 +184,6 @@ ohos_unittest("operation_test") {
  module_out_path = module_output_path
  sources = [
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content/operation_builder.h",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/uri.h",
    "unittest/common/operation_test.cpp",
  ]

@ -194,8 +194,8 @@ ohos_unittest("operation_test") {

  deps = [
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
  ]
@ -242,9 +242,9 @@ ohos_unittest("skills_test") {

  deps = [
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
  ]
@ -293,9 +293,9 @@ ohos_unittest("want_params_wrapper_test") {

  deps = [
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
  ]
@ -317,9 +317,9 @@ ohos_unittest("want_test") {

  deps = [
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
  ]
--- a/frameworks/kits/test/BUILD.gn
+++ b/frameworks/kits/test/BUILD.gn
@ -29,6 +29,7 @@ config("module_private_config") {
    "//utils/native/base/include",
    "//sdk/appexecfwk_L2/appexecfwk_base/include",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
    "//utils/system/safwk/native/include",
@ -97,10 +98,10 @@ ohos_moduletest("ability_moduletest") {
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
    "//third_party/googletest:gmock_main",
@ -141,7 +142,6 @@ ohos_moduletest("ability_conetxt_test") {
    "//foundation/aafwk/standard/services/abilitymgr/src/mission_record_info.cpp",
    "//foundation/aafwk/standard/services/abilitymgr/src/mission_stack_info.cpp",
    "//foundation/aafwk/standard/services/abilitymgr/src/stack_info.cpp",
-    "//foundation/distributedschedule/dmsfwk/utils/native/source/uri.cpp",
    "moduletest/cpp/abilitytest/ability_context_test.cpp",
  ]

@ -159,10 +159,10 @@ ohos_moduletest("ability_conetxt_test") {
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
@ -231,10 +231,10 @@ ohos_moduletest("data_ability_operation_moduletest") {
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
    "//third_party/googletest:gmock_main",
@ -280,10 +280,10 @@ ohos_moduletest("data_ability_helper_module_test") {
    "//foundation/aafwk/standard/frameworks/kits/appkit:appkit_native",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
  ]
--- a/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/completed_dispatcher_test/BUILD.gn
@ -41,12 +41,12 @@ ohos_unittest("completed_dispatcher_test") {
  external_deps = [
    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:abilitykit_native",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
    "ces_standard:cesfwk_core",
-    "dmsfwk_standard:zuri",
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
--- a/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/pending_want_test/BUILD.gn
@ -49,12 +49,12 @@ ohos_unittest("pending_want_test") {
  external_deps = [
    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:abilitykit_native",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
    "ces_standard:cesfwk_core",
-    "dmsfwk_standard:zuri",
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
--- a/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/trigger_Info_test/BUILD.gn
@ -41,12 +41,12 @@ ohos_unittest("trigger_Info_test") {
  external_deps = [
    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:abilitykit_native",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
    "ces_standard:cesfwk_core",
-    "dmsfwk_standard:zuri",
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
--- a/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/want_agent_helper_test/BUILD.gn
@ -46,12 +46,12 @@ ohos_unittest("want_agent_helper_test") {
  external_deps = [
    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:abilitykit_native",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
    "ces_standard:cesfwk_core",
-    "dmsfwk_standard:zuri",
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
--- a/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/want_agent_info_test/BUILD.gn
@ -41,12 +41,12 @@ ohos_unittest("want_agent_info_test") {
  external_deps = [
    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:abilitykit_native",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
    "ces_standard:cesfwk_core",
-    "dmsfwk_standard:zuri",
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
--- a/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn
+++ b/frameworks/kits/wantagent/test/unittest/want_agent_test/BUILD.gn
@ -41,12 +41,12 @@ ohos_unittest("want_agent_test") {
  external_deps = [
    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:abilitykit_native",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
    "ces_standard:cesfwk_core",
-    "dmsfwk_standard:zuri",
    "eventhandler:libeventhandler",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
--- a/interfaces/innerkits/ability_manager/BUILD.gn
+++ b/interfaces/innerkits/ability_manager/BUILD.gn
@ -22,6 +22,7 @@ config("ability_manager_public_config") {
    "${innerkits_path}/want/include",
    "//utils/native/base/include",
    "//utils/system/safwk/native/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
    "//foundation/aafwk/standard/frameworks/kits/ability/native/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include",
@ -93,6 +94,7 @@ ohos_shared_library("ability_manager") {

  deps = [
    "${innerkits_path}/base:base",
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/want:want",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
@ -101,7 +103,6 @@ ohos_shared_library("ability_manager") {
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
    "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability",
    "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
    "//third_party/jsoncpp:jsoncpp",
--- a/interfaces/innerkits/bundle.json
+++ b/interfaces/innerkits/bundle.json
@ -82,9 +82,18 @@
                      ]
                    },
                    "name": "//foundation/aafwk/standard/interfaces/innerkits/app_manager:configuration"
+                },
+                {
+                  "header": {
+                    "header_base": "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
+                    "header_files": [
+                      "uri.h"
+                    ]
+                  },
+                  "name": "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri"
                }
            ],
            "test": []
        }
    }
-}
+}
--- a/interfaces/innerkits/dataobs_manager/BUILD.gn
+++ b/interfaces/innerkits/dataobs_manager/BUILD.gn
@ -46,12 +46,12 @@ ohos_shared_library("dataobs_manager") {
  deps = [
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//utils/native/base:utils",
  ]

  external_deps = [
+    "ability_base:zuri",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
  ]
--- a/interfaces/innerkits/intent/BUILD.gn
+++ b/interfaces/innerkits/intent/BUILD.gn
@ -31,7 +31,7 @@ config("intent_public_config") {
  include_dirs = [
    "//utils/native/base/include",
    "//foundation/aafwk/standard/interfaces/innerkits/intent/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/appexecfwk/standard/common/log/include",
  ]
 }
@ -55,13 +55,13 @@ ohos_shared_library("intent") {
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/lsamgr:lsamgr",
    "//utils/native/base:utils",
  ]

  external_deps = [
+    "ability_base:zuri",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
  ]
--- a/interfaces/innerkits/runtime/BUILD.gn
+++ b/interfaces/innerkits/runtime/BUILD.gn
@ -28,9 +28,9 @@ config("runtime_config") {
  include_dirs = [
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
    "//foundation/aafwk/standard/interfaces/innerkits/base/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//base/global/resmgr_standard/interfaces/innerkits/include",
  ]
 }
--- a/interfaces/innerkits/uri/BUILD.gn
+++ b/interfaces/innerkits/uri/BUILD.gn
@ -0,0 +1,40 @@
+# Copyright (c) 2022 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import("//build/ohos.gni")
+import("//foundation/aafwk/standard/aafwk.gni")
+
+config("zuri_config") {
+  visibility = [ ":*" ]
+  include_dirs = [ "include" ]
+  cflags = []
+  if (target_cpu == "arm") {
+    cflags += [ "-DBINDER_IPC_32BIT" ]
+  }
+}
+
+ohos_shared_library("zuri") {
+  configs = [ "${services_path}/common:common_config" ]
+  public_configs = [ ":zuri_config" ]
+
+  sources = [ "src/uri.cpp" ]
+
+  deps = []
+
+  external_deps = [
+    "hiviewdfx_hilog_native:libhilog",
+    "utils_base:utils",
+  ]
+
+  subsystem_name = "aafwk"
+  part_name = "ability_base"
+}
--- a/interfaces/innerkits/uri/include/uri.h
+++ b/interfaces/innerkits/uri/include/uri.h
@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef UTILS_NATIVE_INCLUDE_URI_H_
+#define UTILS_NATIVE_INCLUDE_URI_H_
+
+#include <string>
+#include <vector>
+#include "parcel.h"
+
+namespace OHOS {
+class Uri : public Parcelable {
+public:
+    explicit Uri(const std::string& uriString);
+    ~Uri() = default;
+
+    /**
+     * Get the Scheme part.
+     *
+     * @return the scheme string.
+     */
+    std::string GetScheme();
+
+    /**
+     * Get the Ssp part.
+     *
+     * @return the SchemeSpecificPart string.
+     */
+    std::string GetSchemeSpecificPart();
+
+    /**
+     * Get the GetAuthority part.
+     *
+     * @return the authority string.
+     */
+    std::string GetAuthority();
+
+    /**
+     * Get the Host part.
+     *
+     * @return the host string.
+     */
+    std::string GetHost();
+
+    /**
+     * Get the Port part.
+     *
+     * @return the port number.
+     */
+    int GetPort();
+
+    /**
+     * Get the User part.
+     *
+     * @return the user string.
+     */
+    std::string GetUserInfo();
+
+    /**
+     * Get the Query part.
+     *
+     * @return the query string.
+     */
+    std::string GetQuery();
+
+    /**
+     * Get the Path part.
+     *
+     * @return the path string.
+     */
+    std::string GetPath();
+
+    /**
+     * Get the path segments.
+     *
+     * @param the path segments of Uri.
+     */
+    void GetPathSegments(std::vector<std::string>& segments);
+
+    /**
+     * Get the Fragment part.
+     *
+     * @return the fragment string.
+     */
+    std::string GetFragment();
+
+    /**
+     * Returns true if this URI is hierarchical like "http://www.example.com".
+     * Absolute URIs are hierarchical if the scheme-specific part starts with a '/'.
+     * Relative URIs are always hierarchical.
+     *
+     * @return true if this URI is hierarchical, false if it's opaque.
+     */
+    bool IsHierarchical();
+
+    /**
+     * Returns true if this URI is opaque like "mailto:nobody@ohos.com".
+     * The scheme-specific part of an opaque URI cannot start with a '/'.
+     *
+     * @return true if this URI is opaque, false if it's hierarchical.
+     */
+    bool IsOpaque();
+
+    /**
+     * Returns true if this URI is absolute, i.e.&nbsp;if it contains an explicit scheme.
+     *
+     * @return true if this URI is absolute, false if it's relative.
+     */
+    bool IsAbsolute();
+
+    /**
+     * Returns true if this URI is relative, i.e.&nbsp;if it doesn't contain an explicit scheme.
+     *
+     * @return true if this URI is relative, false if it's absolute.
+     */
+    bool IsRelative();
+
+    /**
+     * Check whether the other is the same as this.
+     *
+     * @return true if the same string.
+     */
+    bool Equals(const Uri& other) const;
+
+    /**
+     * Compare to other uri.
+     *
+     * @return the string compare result.
+     */
+    int CompareTo(const Uri& other) const;
+
+    /**
+     * Convert to a string object.
+     *
+     * @return a string object.
+     */
+    std::string ToString() const;
+
+    /**
+     * override the == method.
+     *
+     * @return true if the same content, false not the same content.
+     */
+    bool operator==(const Uri& other) const;
+
+    /**
+     * Override Parcelable' interface.
+     *
+     * @return true if parcel write success, false write fail.
+     */
+    virtual bool Marshalling(Parcel& parcel) const override;
+
+    /**
+     * Support the Ummarshlling method for construct object by  Parcel read.
+     *
+     * @return the uri object address.
+     */
+    static Uri* Unmarshalling(Parcel& parcel);
+
+private:
+    bool CheckScheme();
+    std::string ParseScheme();
+    std::string ParseSsp();
+    std::string ParseAuthority();
+    std::string ParseUserInfo();
+    std::string ParseHost();
+    int ParsePort();
+    std::string ParsePath(size_t ssi);
+    std::string ParsePath();
+    std::string ParseQuery();
+    std::string ParseFragment();
+
+    /**
+    * Finds the first ':'.
+    *
+    * @return the pos of the ':', string::npos if none found.
+    */
+    size_t FindSchemeSeparator();
+
+    /**
+     * Finds the first '#'.
+     *
+     * @return the pos of the '#', string::npos if none found.
+     */
+    size_t FindFragmentSeparator();
+
+    std::string uriString_;
+    std::string scheme_;
+    std::string ssp_;
+    std::string authority_;
+    std::string host_;
+    int port_;
+    std::string userInfo_;
+    std::string query_;
+    std::string path_;
+    std::string fragment_;
+    size_t cachedSsi_;
+    size_t cachedFsi_;
+};
+} // namespace OHOS
+#endif // #ifndef UTILS_NATIVE_INCLUDE_URI_H_
--- a/interfaces/innerkits/uri/src/uri.cpp
+++ b/interfaces/innerkits/uri/src/uri.cpp
@ -0,0 +1,510 @@
+/*
+ * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <regex>
+#include <vector>
+#include "hilog/log.h"
+#include "string_ex.h"
+#include "uri.h"
+
+using std::string;
+using std::regex;
+using OHOS::HiviewDFX::HiLog;
+
+namespace OHOS {
+namespace {
+    const string NOT_CACHED = "NOT VALID";
+    const string EMPTY = "";
+    const size_t NOT_FOUND = string::npos;
+    const int NOT_CALCULATED = -2;
+    const int PORT_NONE = -1;
+    const char SCHEME_SEPARATOR = ':';
+    const char SCHEME_FRAGMENT = '#';
+    const char LEFT_SEPARATOR = '/';
+    const char RIGHT_SEPARATOR = '\\';
+    const char QUERY_FLAG = '?';
+    const char USER_HOST_SEPARATOR = '@';
+    const char PORT_SEPARATOR = ':';
+    const size_t POS_INC = 1;
+    const size_t POS_INC_MORE = 2;
+    const size_t POS_INC_AGAIN = 3;
+    const regex SCHEME_REGEX("[a-zA-Z][a-zA-Z|\\d|+|-|.]*$");
+    const HiviewDFX::HiLogLabel LABEL = {LOG_CORE, 0xD001800, "URI"};
+}; // namespace
+
+Uri::Uri(const string& uriString)
+{
+    cachedSsi_ = NOT_FOUND;
+    cachedFsi_ = NOT_FOUND;
+    port_ = NOT_CALCULATED;
+
+    if (uriString.empty()) {
+        HiLog::Error(LABEL, "Input empty!");
+        return;
+    }
+
+    uriString_ = uriString;
+    scheme_ = NOT_CACHED;
+    ssp_ = NOT_CACHED;
+    authority_ = NOT_CACHED;
+    host_ = NOT_CACHED;
+    userInfo_ = NOT_CACHED;
+    query_ = NOT_CACHED;
+    path_ = NOT_CACHED;
+    fragment_ = NOT_CACHED;
+
+    if (!CheckScheme()) {
+        uriString_ = EMPTY;
+        HiLog::Error(LABEL, "Scheme wrong!");
+    }
+}
+
+bool Uri::CheckScheme()
+{
+    scheme_ = ParseScheme();
+    if (scheme_.empty()) {
+        return true;
+    }
+    return regex_match(scheme_, SCHEME_REGEX);
+}
+
+string Uri::GetScheme()
+{
+    if (uriString_.empty()) {
+        return EMPTY;
+    }
+
+    if (scheme_ == NOT_CACHED) {
+        scheme_ = ParseScheme();
+    }
+    return scheme_;
+}
+
+string Uri::ParseScheme()
+{
+    size_t ssi = FindSchemeSeparator();
+    return (ssi == NOT_FOUND) ? EMPTY : uriString_.substr(0, ssi);
+}
+
+string Uri::GetSchemeSpecificPart()
+{
+    if (uriString_.empty()) {
+        return EMPTY;
+    }
+
+    return (ssp_ == NOT_CACHED) ? (ssp_ = ParseSsp()) : ssp_;
+}
+
+string Uri::ParseSsp()
+{
+    size_t ssi = FindSchemeSeparator();
+    size_t fsi = FindFragmentSeparator();
+
+    size_t start = (ssi == NOT_FOUND) ? 0 : (ssi + 1);
+    size_t end = (fsi == NOT_FOUND) ? uriString_.size() : fsi;
+
+    // Return everything between ssi and fsi.
+    string ssp = EMPTY;
+    if (end > start) {
+        ssp = uriString_.substr(start, end - start);
+    }
+
+    return ssp;
+}
+
+string Uri::GetAuthority()
+{
+    if (uriString_.empty()) {
+        return EMPTY;
+    }
+
+    if (authority_ == NOT_CACHED) {
+        authority_ = ParseAuthority();
+    }
+    return authority_;
+}
+
+string Uri::ParseAuthority()
+{
+    size_t ssi = FindSchemeSeparator();
+    if (ssi == NOT_FOUND) {
+        return EMPTY;
+    }
+
+    size_t length = uriString_.length();
+    // If "//" follows the scheme separator, we have an authority.
+    if ((length > (ssi + POS_INC_MORE)) && (uriString_.at(ssi + POS_INC) == LEFT_SEPARATOR) &&
+        (uriString_.at(ssi + POS_INC_MORE) == LEFT_SEPARATOR)) {
+        // Look for the start of the path, query, or fragment, or the end of the string.
+        size_t start = ssi + POS_INC_AGAIN;
+        size_t end = start;
+
+        while (end < length) {
+            char ch = uriString_.at(end);
+            if ((ch == LEFT_SEPARATOR) || (ch == RIGHT_SEPARATOR) || (ch == QUERY_FLAG) ||
+                (ch == SCHEME_FRAGMENT)) {
+                break;
+            }
+
+            end++;
+        }
+
+        return uriString_.substr(start, end - start);
+    } else {
+        return EMPTY;
+    }
+}
+
+string Uri::GetUserInfo()
+{
+    if (uriString_.empty()) {
+        return EMPTY;
+    }
+
+    if (userInfo_ == NOT_CACHED) {
+        userInfo_ = ParseUserInfo();
+    }
+    return userInfo_;
+}
+
+string Uri::ParseUserInfo()
+{
+    string authority = GetAuthority();
+    if (authority.empty()) {
+        return EMPTY;
+    }
+
+    size_t end = authority.find_last_of(USER_HOST_SEPARATOR);
+    return (end == NOT_FOUND) ? EMPTY : authority.substr(0, end);
+}
+
+string Uri::GetHost()
+{
+    if (uriString_.empty()) {
+        return EMPTY;
+    }
+
+    if (host_ == NOT_CACHED) {
+        host_ = ParseHost();
+    }
+    return host_;
+}
+
+string Uri::ParseHost()
+{
+    string authority = GetAuthority();
+    if (authority.empty()) {
+        return EMPTY;
+    }
+
+    // Parse out user info and then port.
+    size_t userInfoSeparator = authority.find_last_of(USER_HOST_SEPARATOR);
+    size_t start = (userInfoSeparator == NOT_FOUND) ? 0 : (userInfoSeparator + 1);
+    size_t portSeparator = authority.find_first_of(PORT_SEPARATOR, start);
+    size_t end = (portSeparator == NOT_FOUND) ? authority.size() : portSeparator;
+
+    string host = EMPTY;
+    if (start < end) {
+        host = authority.substr(start, end - start);
+    }
+
+    return host;
+}
+
+int Uri::GetPort()
+{
+    if (uriString_.empty()) {
+        return PORT_NONE;
+    }
+
+    if (port_ == NOT_CALCULATED) {
+        port_ = ParsePort();
+    }
+    return port_;
+}
+
+int Uri::ParsePort()
+{
+    string authority = GetAuthority();
+    if (authority.empty()) {
+        return PORT_NONE;
+    }
+
+    // Make sure we look for the port separtor *after* the user info separator.
+    size_t userInfoSeparator = authority.find_last_of(USER_HOST_SEPARATOR);
+    size_t start = (userInfoSeparator == NOT_FOUND) ? 0 : (userInfoSeparator + 1);
+    size_t portSeparator = authority.find_first_of(PORT_SEPARATOR, start);
+    if (portSeparator == NOT_FOUND) {
+        return PORT_NONE;
+    }
+
+    start = portSeparator + 1;
+    string portString = authority.substr(start);
+
+    int value = PORT_NONE;
+    return StrToInt(portString, value) ? value : PORT_NONE;
+}
+
+string Uri::GetQuery()
+{
+    if (uriString_.empty()) {
+        return EMPTY;
+    }
+
+    if (query_ == NOT_CACHED) {
+        query_ = ParseQuery();
+    }
+    return query_;
+}
+
+string Uri::ParseQuery()
+{
+    size_t ssi = FindSchemeSeparator();
+    if (ssi == NOT_FOUND) {
+        ssi = 0;
+    }
+    size_t qsi = uriString_.find_first_of(QUERY_FLAG, ssi);
+    if (qsi == NOT_FOUND) {
+        return EMPTY;
+    }
+
+    size_t start = qsi + 1;
+    size_t fsi = FindFragmentSeparator();
+    if (fsi == NOT_FOUND) {
+        return uriString_.substr(start);
+    }
+
+    if (fsi < qsi) {
+        // Invalid.
+        return EMPTY;
+    }
+
+    return uriString_.substr(start, fsi - start);
+}
+
+string Uri::GetPath()
+{
+    if (uriString_.empty()) {
+        return EMPTY;
+    }
+
+    if (path_ == NOT_CACHED) {
+        path_ = ParsePath();
+    }
+    return path_;
+}
+
+void Uri::GetPathSegments(std::vector<std::string>& segments)
+{
+    if (uriString_.empty()) {
+        return;
+    }
+    if (path_ == NOT_CACHED) {
+        path_ = ParsePath();
+    }
+
+    size_t previous = 0;
+    size_t current;
+    while ((current = path_.find(LEFT_SEPARATOR, previous)) != std::string::npos) {
+        if (previous < current) {
+            segments.emplace_back(path_.substr(previous, current - previous));
+        }
+        previous = current + POS_INC;
+    }
+    // Add in the final path segment.
+    if (previous < path_.length()) {
+        segments.emplace_back(path_.substr(previous));
+    }
+}
+
+string Uri::ParsePath()
+{
+    size_t ssi = FindSchemeSeparator();
+    // If the URI is absolute.
+    if (ssi != NOT_FOUND) {
+        // Is there anything after the ':'?
+        if ((ssi + 1) == uriString_.length()) {
+            // Opaque URI.
+            return EMPTY;
+        }
+
+        // A '/' after the ':' means this is hierarchical.
+        if (uriString_.at(ssi + 1) != LEFT_SEPARATOR) {
+            // Opaque URI.
+            return EMPTY;
+        }
+    } else {
+        // All relative URIs are hierarchical.
+    }
+
+    return ParsePath(ssi);
+}
+
+string Uri::ParsePath(size_t ssi)
+{
+    size_t length = uriString_.length();
+
+    // Find start of path.
+    size_t pathStart = (ssi == NOT_FOUND) ? 0 : (ssi + POS_INC);
+    if ((length > (pathStart + POS_INC)) && (uriString_.at(pathStart) == LEFT_SEPARATOR) &&
+        (uriString_.at(pathStart + POS_INC) == LEFT_SEPARATOR)) {
+        // Skip over authority to path.
+        pathStart += POS_INC_MORE;
+
+        while (pathStart < length) {
+            char ch = uriString_.at(pathStart);
+            if ((ch == QUERY_FLAG) || (ch == SCHEME_FRAGMENT)) {
+                return EMPTY;
+            }
+
+            if ((ch == LEFT_SEPARATOR) || (ch == RIGHT_SEPARATOR)) {
+                break;
+            }
+
+            pathStart++;
+        }
+    }
+
+    // Find end of path.
+    size_t pathEnd = pathStart;
+    while (pathEnd < length) {
+        char ch = uriString_.at(pathEnd);
+        if ((ch == QUERY_FLAG) || (ch == SCHEME_FRAGMENT)) {
+            break;
+        }
+
+        pathEnd++;
+    }
+
+    return uriString_.substr(pathStart, pathEnd - pathStart);
+}
+
+string Uri::GetFragment()
+{
+    if (uriString_.empty()) {
+        return EMPTY;
+    }
+
+    if (fragment_ == NOT_CACHED) {
+        fragment_ = ParseFragment();
+    }
+    return fragment_;
+}
+
+string Uri::ParseFragment()
+{
+    size_t fsi = FindFragmentSeparator();
+    return (fsi == NOT_FOUND) ? EMPTY : uriString_.substr(fsi + 1);
+}
+
+size_t Uri::FindSchemeSeparator()
+{
+    if (cachedSsi_ == NOT_FOUND) {
+        cachedSsi_ = uriString_.find_first_of(SCHEME_SEPARATOR);
+    }
+    return cachedSsi_;
+}
+
+size_t Uri::FindFragmentSeparator()
+{
+    if (cachedFsi_ == NOT_FOUND) {
+        cachedFsi_ = uriString_.find_first_of(SCHEME_FRAGMENT, FindSchemeSeparator());
+    }
+    return cachedFsi_;
+}
+
+bool Uri::IsHierarchical()
+{
+    if (uriString_.empty()) {
+        return false;
+    }
+
+    size_t ssi = FindSchemeSeparator();
+    if (ssi == NOT_FOUND) {
+        // All relative URIs are hierarchical.
+        return true;
+    }
+
+    if (uriString_.length() == (ssi + 1)) {
+        // No ssp.
+        return false;
+    }
+
+    // If the ssp starts with a '/', this is hierarchical.
+    return (uriString_.at(ssi + 1) == LEFT_SEPARATOR);
+}
+
+bool Uri::IsOpaque()
+{
+    if (uriString_.empty()) {
+        return false;
+    }
+
+    return !IsHierarchical();
+}
+
+bool Uri::IsAbsolute()
+{
+    if (uriString_.empty()) {
+        return false;
+    }
+
+    return !IsRelative();
+}
+
+bool Uri::IsRelative()
+{
+    if (uriString_.empty()) {
+        return false;
+    }
+
+    // Note: We return true if the index is 0
+    return FindSchemeSeparator() == NOT_FOUND;
+}
+
+bool Uri::Equals(const Uri& other) const
+{
+    return ToString() == other.ToString();
+}
+
+int Uri::CompareTo(const Uri& other) const
+{
+    return ToString().compare(other.ToString());
+}
+
+string Uri::ToString() const
+{
+    return uriString_;
+}
+
+bool Uri::operator==(const Uri& other) const
+{
+    return ToString() == other.ToString();
+}
+
+bool Uri::Marshalling(Parcel& parcel) const
+{
+    if (IsAsciiString(uriString_)) {
+        return parcel.WriteString16(Str8ToStr16(uriString_));
+    }
+
+    return false;
+}
+
+Uri* Uri::Unmarshalling(Parcel& parcel)
+{
+    return new Uri(Str16ToStr8(parcel.ReadString16()));
+}
+} // namespace OHOS
--- a/interfaces/innerkits/uri_permission/BUILD.gn
+++ b/interfaces/innerkits/uri_permission/BUILD.gn
@ -37,8 +37,8 @@ ohos_shared_library("uri_permission_mgr") {
  deps = [ "${innerkits_path}/want:want" ]

  external_deps = [
+    "ability_base:zuri",
    "access_token:libaccesstoken_sdk",
-    "dmsfwk_standard:zuri",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
    "safwk:system_ability_fwk",
--- a/interfaces/innerkits/want/BUILD.gn
+++ b/interfaces/innerkits/want/BUILD.gn
@ -32,9 +32,9 @@ config("want_public_config") {
    "//utils/native/base/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include",
    "//foundation/aafwk/standard/interfaces/innerkits/base/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/appexecfwk/standard/common/log/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
    "//foundation/aafwk/standard/frameworks/kits/content/cpp/src",
    "//third_party/jsoncpp/include",
@ -60,8 +60,8 @@ ohos_shared_library("want") {

  deps = [
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/appexecfwk/standard/common:libappexecfwk_common",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/jsoncpp:jsoncpp",
    "//utils/native/base:utils",
  ]
--- a/interfaces/kits/napi/aafwk/dataShare/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/dataShare/BUILD.gn
@ -42,13 +42,13 @@ ohos_shared_library("datashare") {
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
    "//foundation/ace/napi:ace_napi",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/libuv:uv_static",
    "//utils/native/base:utils",
  ]

  external_deps = [
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:app_manager",
    "ability_runtime:napi_base_context",
--- a/interfaces/kits/napi/aafwk/dataUriUtils/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/dataUriUtils/BUILD.gn
@ -34,12 +34,12 @@ ohos_shared_library("datauriutils") {
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
    "//foundation/ace/napi:ace_napi",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//utils/native/base:utils",
  ]

  external_deps = [
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:app_manager",
    "bundle_framework:appexecfwk_base",
--- a/interfaces/kits/napi/aafwk/featureAbility/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/featureAbility/BUILD.gn
@ -50,7 +50,6 @@ ohos_shared_library("featureability") {
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
    "//foundation/ace/napi:ace_napi",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/jsoncpp:jsoncpp",
    "//third_party/libuv:uv_static",
    "//utils/native/base:utils",
@ -58,6 +57,7 @@ ohos_shared_library("featureability") {

  external_deps = [
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:app_manager",
    "ability_runtime:napi_base_context",
--- a/interfaces/kits/napi/aafwk/mission_manager/distributed_mission_manager.h
+++ b/interfaces/kits/napi/aafwk/mission_manager/distributed_mission_manager.h
@ -22,7 +22,6 @@
 #include "mission_continue_stub.h"
 #include "napi/native_api.h"
 #include "napi/native_node_api.h"
-#include "parcel_helper.h"
 #include "securec.h"
 #include "want.h"
 #include "remote_mission_listener_stub.h"
@ -146,4 +145,4 @@ enum ErrorCode {
 };
 }  // namespace AAFwk
 }  // namespace OHOS
-#endif  // OHOS_DISTRIBUTED_MISSION_MANAGER_H
+#endif  // OHOS_DISTRIBUTED_MISSION_MANAGER_H
--- a/interfaces/kits/napi/aafwk/particleAbility/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/particleAbility/BUILD.gn
@ -49,7 +49,6 @@ ohos_shared_library("particleability") {
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
    "//foundation/aafwk/standard/interfaces/kits/napi/aafwk/inner/napi_common:napi_common",
    "//foundation/ace/napi:ace_napi",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/jsoncpp:jsoncpp",
    "//third_party/libuv:uv_static",
    "//utils/native/base:utils",
@ -57,6 +56,7 @@ ohos_shared_library("particleability") {

  external_deps = [
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:app_manager",
    "ability_runtime:napi_base_context",
--- a/interfaces/kits/napi/aafwk/uri_permission/BUILD.gn
+++ b/interfaces/kits/napi/aafwk/uri_permission/BUILD.gn
@ -32,10 +32,10 @@ ohos_shared_library("uripermissionmanager_napi") {
  ]

  external_deps = [
+    "ability_base:zuri",
    "ability_runtime:ability_manager",
    "ability_runtime:runtime",
    "bundle_framework:appexecfwk_base",
-    "dmsfwk_standard:zuri",
    "hiviewdfx_hilog_native:libhilog",
  ]

--- a/ohos.build
+++ b/ohos.build
@ -241,6 +241,15 @@
            ]
          },
          "name": "//foundation/aafwk/standard/interfaces/innerkits/app_manager:configuration"
+        },
+        {
+          "header": {
+            "header_base": "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
+            "header_files": [
+              "uri.h"
+            ]
+          },
+          "name": "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri"
        }
      ],
      "test_list": [
--- a/services/abilitymgr/BUILD.gn
+++ b/services/abilitymgr/BUILD.gn
@ -37,6 +37,7 @@ config("abilityms_config") {
    "${innerkits_path}/ability_manager/include",
    "${innerkits_path}/app_manager/include",
    "${innerkits_path}/base/include",
+    "${innerkits_path}/uri/include",
    "${innerkits_path}/want/include",
    "${innerkits_path}/want/include/ohos/aafwk/content",
    "${innerkits_path}/intent/include/ohos/aafwk/content",
@ -57,7 +58,6 @@ config("abilityms_config") {
    "//foundation/aafwk/standard/tools/aa/include",
    "//foundation/graphic/standard/interfaces/innerkits/wmservice",
    "//base/global/i18n_standard/frameworks/intl/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//base/hiviewdfx/hiview/adapter/utility/include",
    "//base/account/os_account/frameworks/common/account_error/include",
    "//base/account/os_account/frameworks/common/database/include",
@ -79,6 +79,7 @@ ohos_shared_library("abilityms") {
  configs = [ ":abilityms_config" ]
  deps = [
    "${innerkits_path}/base:base",
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/uri_permission:uri_permission_mgr",
    "${innerkits_path}/want:want",
    "${services_path}/common:perm_verification",
@ -95,7 +96,6 @@ ohos_shared_library("abilityms") {
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
    "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_dataability:native_dataability",
    "//foundation/distributeddatamgr/appdatamgr/interfaces/innerkits/native_rdb:native_rdb",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
--- a/services/abilitymgr/src/ability_manager_service.cpp
+++ b/services/abilitymgr/src/ability_manager_service.cpp
@ -40,7 +40,6 @@
 #include "itest_observer.h"
 #include "locale_config.h"
 #include "lock_screen_white_list.h"
-#include "mission/mission_info_converter.h"
 #include "mission_info_mgr.h"
 #include "permission_constants.h"
 #include "permission_verification.h"
--- a/services/abilitymgr/test/mock/libs/aakit/BUILD.gn
+++ b/services/abilitymgr/test/mock/libs/aakit/BUILD.gn
@ -18,6 +18,7 @@ config("aakit_mock_config") {
  include_dirs = [
    "//foundation/aafwk/standard/services/abilitymgr/test/mock/libs/aakit/include",
    "//foundation/aafwk/standard/interfaces/innerkits/ability_manager/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/services/abilitymgr/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include",
@ -25,7 +26,6 @@ config("aakit_mock_config") {
    "//foundation/aafwk/standard/frameworks/kits/ability/native/include/",
    "include/",
    "//third_party/jsoncpp/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/",
    "//foundation/aafwk/standard/services/common/include/",
  ]
 }
--- 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
@ -38,6 +38,7 @@ ohos_unittest("ability_connect_callback_proxy_test") {
    cflags += [ "-DBINDER_IPC_32BIT" ]
  }
  deps = [
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/want:want",
    "${services_path}/abilitymgr/test:abilityms_test_source",
    "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock",
@ -49,7 +50,6 @@ ohos_unittest("ability_connect_callback_proxy_test") {
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- 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
@ -38,6 +38,7 @@ ohos_unittest("ability_connect_callback_stub_test") {
    cflags += [ "-DBINDER_IPC_32BIT" ]
  }
  deps = [
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/want:want",
    "${services_path}/abilitymgr/test:abilityms_test_source",
    "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock",
@ -50,7 +51,6 @@ ohos_unittest("ability_connect_callback_stub_test") {

    # "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_connect_manage_test/BUILD.gn
@ -37,6 +37,7 @@ ohos_unittest("ability_connect_manage_test") {
    cflags += [ "-DBINDER_IPC_32BIT" ]
  }
  deps = [
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/want:want",
    "${services_path}/abilitymgr/test:abilityms_test_source",
    "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock",
@ -47,7 +48,6 @@ ohos_unittest("ability_connect_manage_test") {
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//third_party/googletest:gtest_main",
--- a/services/abilitymgr/test/unittest/phone/ability_dump_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_dump_test/BUILD.gn
@ -40,6 +40,7 @@ ohos_unittest("ability_dump_test") {
    cflags += [ "-DBINDER_IPC_32BIT" ]
  }
  deps = [
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/want:want",
    "${services_path}/abilitymgr/test:abilityms_test_source",
    "${services_path}/abilitymgr/test/mock/appmgr_test_service:appmgr_test_service",
@ -52,7 +53,6 @@ ohos_unittest("ability_dump_test") {
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_manager_proxy_test/BUILD.gn
@ -47,11 +47,11 @@ ohos_unittest("ability_manager_proxy_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",

    # "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_manager_service_test/BUILD.gn
@ -39,6 +39,7 @@ ohos_unittest("ability_manager_service_test") {
    cflags += [ "-DBINDER_IPC_32BIT" ]
  }
  deps = [
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/want:want",
    "${services_path}/abilitymgr/test:abilityms_test_source",
    "${services_path}/abilitymgr/test/mock/libs/aakit:aakit_mock",
@ -51,7 +52,6 @@ ohos_unittest("ability_manager_service_test") {
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_manager_stub_test/BUILD.gn
@ -48,10 +48,10 @@ ohos_unittest("ability_manager_stub_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_record_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("ability_record_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_proxy_test/BUILD.gn
@ -47,11 +47,11 @@ ohos_unittest("ability_scheduler_proxy_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",

    # "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_scheduler_stub_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("ability_scheduler_stub_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_service_start_test/BUILD.gn
@ -47,10 +47,10 @@ ohos_unittest("ability_service_start_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_stack_manager_test/BUILD.gn
@ -50,10 +50,10 @@ ohos_unittest("ability_stack_manager_test") {
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_token_proxy_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("ability_token_proxy_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_token_stub_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("ability_token_stub_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/ability_with_applications_test/BUILD.gn
@ -49,10 +49,10 @@ ohos_unittest("ability_with_applications_test") {
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/abilityms_appms_test/BUILD.gn
@ -49,10 +49,10 @@ ohos_unittest("abilityms_appms_test") {
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/app_scheduler_test/BUILD.gn
@ -48,9 +48,9 @@ ohos_unittest("app_scheduler_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/configuration_test/BUILD.gn
@ -49,10 +49,10 @@ ohos_unittest("configuration_test") {
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/connection_record_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("connection_record_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/data_ability_manager_test/BUILD.gn
@ -55,10 +55,10 @@ ohos_unittest("data_ability_manager_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",

    #"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/data_ability_record_test/BUILD.gn
@ -52,11 +52,11 @@ ohos_unittest("data_ability_record_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",

    #"//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/info_test/BUILD.gn
@ -46,11 +46,11 @@ ohos_unittest("info_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",

    # "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/lifecycle_deal_test/BUILD.gn
@ -47,10 +47,10 @@ ohos_unittest("lifecycle_deal_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/lifecycle_test/BUILD.gn
@ -47,10 +47,10 @@ ohos_unittest("lifecycle_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- 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
@ -51,10 +51,10 @@ ohos_unittest("lock_screen_white_list_test") {
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/mission_list_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("mission_list_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/mission_record_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("mission_record_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/mission_stack_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("mission_stack_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/mission_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("mission_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/pending_want_key_test/BUILD.gn
@ -40,10 +40,10 @@ ohos_unittest("pending_want_key_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/pending_want_manager_test/BUILD.gn
@ -44,10 +44,10 @@ ohos_unittest("pending_want_manager_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/pending_want_record_test/BUILD.gn
@ -44,10 +44,10 @@ ohos_unittest("pending_want_record_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/resume_mission_container_test/BUILD.gn
@ -44,10 +44,10 @@ ohos_unittest("resume_mission_container_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/screenshot_handler_test/BUILD.gn
@ -51,10 +51,10 @@ ohos_unittest("ability_screenshot_handler_test") {
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/sender_info_test/BUILD.gn
@ -44,10 +44,10 @@ ohos_unittest("sender_info_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/terminate_ability_test/BUILD.gn
@ -49,10 +49,10 @@ ohos_unittest("terminate_ability_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_receiver_proxy_test/BUILD.gn
@ -45,10 +45,10 @@ ohos_unittest("want_receiver_proxy_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_receiver_stub_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("want_receiver_stub_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_sender_info_test/BUILD.gn
@ -44,10 +44,10 @@ ohos_unittest("want_sender_info_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_sender_proxy_test/BUILD.gn
@ -45,10 +45,10 @@ ohos_unittest("want_sender_proxy_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/want_sender_stub_test/BUILD.gn
@ -46,10 +46,10 @@ ohos_unittest("want_sender_stub_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/wants_info_test/BUILD.gn
@ -45,10 +45,10 @@ ohos_unittest("wants_info_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
--- a/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn
+++ b/services/abilitymgr/test/unittest/phone/window_info_test/BUILD.gn
@ -40,8 +40,8 @@ ohos_unittest("window_info_test") {
    "${services_path}/common:perm_verification",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:abilitykit_native",
    "//foundation/aafwk/standard/frameworks/kits/ability/native:dummy_classes",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gtest_main",
    "//third_party/libpng:libpng",
    "//utils/native/base:utils",
--- a/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn
+++ b/services/appmgr/test/unittest/ams_ability_running_record_test/BUILD.gn
@ -24,7 +24,7 @@ ohos_unittest("AmsAbilityRunningRecordTest") {
    "//foundation/aafwk/standard/interfaces/innerkits/want/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager/inclide",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
    "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
--- a/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn
+++ b/services/appmgr/test/unittest/ams_app_mgr_client_test/BUILD.gn
@ -29,8 +29,8 @@ ohos_unittest("AmsAppMgrClientTest") {
  include_dirs = [
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler/include/",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include/",
    "//foundation/aafwk/standard/interfaces/innerkits/base/include/",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include/",
    "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/",
    "//base/account/os_account/frameworks/common/database/include",
--- a/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn
+++ b/services/appmgr/test/unittest/ams_app_running_record_test/BUILD.gn
@ -21,9 +21,9 @@ ohos_unittest("AmsAppRunningRecordTest") {

  include_dirs = [
    "//foundation/aafwk/standard/interfaces/innerkits/base/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
    "//foundation/distributedschedule/samgr/adapter/interfaces/innerkits/include/",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include/ohos/aafwk/content",
--- a/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn
+++ b/services/appmgr/test/unittest/ams_mgr_scheduler_test/BUILD.gn
@ -21,9 +21,9 @@ ohos_unittest("AmsMgrSchedulerTest") {

  include_dirs = [
    "//foundation/aafwk/standard/interfaces/innerkits/base/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include",
    "//foundation/aafwk/standard/services/appmgr/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include",
    "//base/account/os_account/frameworks/common/database/include",
--- a/services/dataobsmgr/BUILD.gn
+++ b/services/dataobsmgr/BUILD.gn
@ -54,13 +54,13 @@ ohos_shared_library("dataobsms") {
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//utils/native/base:utils",
  ]

  external_deps = [
+    "ability_base:zuri",
    "bundle_framework:appexecfwk_core",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
--- a/services/dataobsmgr/test/unittest/phone/data_ability_observer_proxy_test/BUILD.gn
+++ b/services/dataobsmgr/test/unittest/phone/data_ability_observer_proxy_test/BUILD.gn
@ -31,10 +31,10 @@ ohos_unittest("data_ability_observer_proxy_test") {
  deps = [
    "${innerkits_path}/want:want",
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/dataobsmgr:dataobsms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
--- a/services/dataobsmgr/test/unittest/phone/data_ability_observer_stub_test/BUILD.gn
+++ b/services/dataobsmgr/test/unittest/phone/data_ability_observer_stub_test/BUILD.gn
@ -31,10 +31,10 @@ ohos_unittest("data_ability_observer_stub_test") {
  deps = [
    "${innerkits_path}/want:want",
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/dataobsmgr:dataobsms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
--- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_client_test/BUILD.gn
+++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_client_test/BUILD.gn
@ -35,10 +35,10 @@ ohos_unittest("dataobs_mgr_client_test") {
  deps = [
    "${innerkits_path}/want:want",
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/dataobsmgr:dataobsms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
--- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_inner_test/BUILD.gn
+++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_inner_test/BUILD.gn
@ -31,10 +31,10 @@ ohos_unittest("dataobs_mgr_inner_test") {
  deps = [
    "${innerkits_path}/want:want",
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/dataobsmgr:dataobsms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
--- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_proxy_test/BUILD.gn
+++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_proxy_test/BUILD.gn
@ -29,12 +29,12 @@ ohos_unittest("dataobs_mgr_proxy_test") {
    cflags += [ "-DBINDER_IPC_32BIT" ]
  }
  deps = [
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/want:want",
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
    "//foundation/aafwk/standard/services/dataobsmgr:dataobsms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
--- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_service_test/BUILD.gn
+++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_service_test/BUILD.gn
@ -32,10 +32,10 @@ ohos_unittest("dataobs_mgr_service_test") {
  deps = [
    "${innerkits_path}/want:want",
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/dataobsmgr:dataobsms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
--- a/services/dataobsmgr/test/unittest/phone/dataobs_mgr_stub_test/BUILD.gn
+++ b/services/dataobsmgr/test/unittest/phone/dataobs_mgr_stub_test/BUILD.gn
@ -31,10 +31,10 @@ ohos_unittest("dataobs_mgr_stub_test") {
  deps = [
    "${innerkits_path}/want:want",
    "//foundation/aafwk/standard/interfaces/innerkits/dataobs_manager:dataobs_manager",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/services/dataobsmgr:dataobsms",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//third_party/googletest:gmock_main",
    "//third_party/googletest:gtest_main",
    "//utils/native/base:utils",
--- a/services/formmgr/BUILD.gn
+++ b/services/formmgr/BUILD.gn
@ -96,7 +96,6 @@ ohos_shared_library("libfms") {
    "//foundation/aafwk/standard/frameworks/kits/appkit:app_context",
    "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits",
    "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr",
    "//utils/native/base:utils",

    #  "//third_party/libuuid:libuuid_static",
@ -105,12 +104,12 @@ ohos_shared_library("libfms") {
  external_deps = [
    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:app_manager",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
    "ces_standard:cesfwk_core",
    "ces_standard:cesfwk_innerkits",
-    "dmsfwk_standard:zuri",
    "form_runtime:form_manager",
    "hiviewdfx_hilog_native:libhilog",
    "ipc:ipc_core",
--- a/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn
+++ b/services/formmgr/test/unittest/fms_form_set_next_refresh_test/BUILD.gn
@ -66,9 +66,9 @@ ohos_unittest("FmsFormSetNextRefreshTest") {

    #"${libs_path}/libeventhandler:libeventhandler_target",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",
    "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//third_party/googletest:gmock_main",
--- a/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn
+++ b/services/formmgr/test/unittest/fms_form_sys_event_receiver_test/BUILD.gn
@ -65,12 +65,12 @@ ohos_unittest("FmsFormSysEventReceiverTest") {
    "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits",
    "//foundation/aafwk/standard/interfaces/innerkits/app_manager:app_manager",
    "//foundation/aafwk/standard/interfaces/innerkits/base:base",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri:zuri",
    "//foundation/aafwk/standard/interfaces/innerkits/want:want",

    #"${appexecfwk_path}/services/bundlemgr:bms_target",
    "//foundation/aafwk/standard/services/abilitymgr:abilityms_target",
    "//foundation/distributeddatamgr/distributeddatamgr/interfaces/innerkits/distributeddata:distributeddata_inner",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//third_party/googletest:gmock_main",
--- a/services/formmgr/test/unittest/fms_form_timer_mgr_test/BUILD.gn
+++ b/services/formmgr/test/unittest/fms_form_timer_mgr_test/BUILD.gn
@ -41,7 +41,6 @@ ohos_unittest("FmsFormTimerMgrTest") {
    "//base/miscservices/time/services:time_service",
    "//base/notification/ces_standard/frameworks/common:libevent_common",
    "//foundation/aafwk/standard/frameworks/kits/wantagent:wantagent_innerkits",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr:distributedschedsvr",
    "//third_party/googletest:gmock_main",
    "//utils/native/base:utils",
  ]
@ -49,6 +48,7 @@ ohos_unittest("FmsFormTimerMgrTest") {
  external_deps = [
    "ability_base:base",
    "ability_base:want",
+    "ability_base:zuri",
    "ability_runtime:app_manager",
    "bundle_framework:appexecfwk_base",
    "bundle_framework:appexecfwk_core",
--- a/services/test/moduletest/ability_mgr_service_test/BUILD.gn
+++ b/services/test/moduletest/ability_mgr_service_test/BUILD.gn
@ -86,6 +86,7 @@ ohos_moduletest("ability_mgr_module_test") {
  }
  deps = [
    "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/uri_permission:uri_permission_mgr",
    "${innerkits_path}/want:want",
    "${services_path}/common:perm_verification",
@ -97,7 +98,6 @@ ohos_moduletest("ability_mgr_module_test") {
    "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
--- a/services/test/moduletest/ability_record_test/BUILD.gn
+++ b/services/test/moduletest/ability_record_test/BUILD.gn
@ -90,6 +90,7 @@ ohos_moduletest("AbilityRecordModuleTest") {
  }
  deps = [
    "${innerkits_path}/base:base",
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/uri_permission:uri_permission_mgr",
    "${innerkits_path}/want:want",
    "${services_path}/common:perm_verification",
@ -103,7 +104,6 @@ ohos_moduletest("AbilityRecordModuleTest") {
    "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
--- a/services/test/moduletest/ability_stack_test/BUILD.gn
+++ b/services/test/moduletest/ability_stack_test/BUILD.gn
@ -88,6 +88,7 @@ ohos_moduletest("ability_stack_module_test") {
  deps = [
    "${aafwk_path}/interfaces/innerkits/app_manager:app_manager",
    "${innerkits_path}/base:base",
+    "${innerkits_path}/uri:zuri",
    "${innerkits_path}/uri_permission:uri_permission_mgr",
    "${innerkits_path}/want:want",
    "${services_path}/common:perm_verification",
@ -99,7 +100,6 @@ ohos_moduletest("ability_stack_module_test") {
    "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base",
    "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler",
-    "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri",
    "//foundation/distributedschedule/safwk/interfaces/innerkits/safwk:system_ability_fwk",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy",
    "//foundation/multimedia/image_standard/interfaces/innerkits:image_native",
--- a/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn
+++ b/services/test/moduletest/common/ams/ipc_ams_mgr_test/BUILD.gn
@ -21,9 +21,9 @@ ohos_moduletest("AmsIpcAmsmgrModuleTest") {

  include_dirs = [
    "//foundation/aafwk/standard/interfaces/innerkits/base/include",
+    "//foundation/aafwk/standard/interfaces/innerkits/uri/include",
    "//foundation/aafwk/standard/interfaces/innerkits/want/include",
    "//foundation/aafwk/standard/services/appmgr/include",
-    "//foundation/distributedschedule/dmsfwk/services/dtbschedmgr/include",
    "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy/include",
    "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_core/include",
    "//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
--- a/Show More
+++ b/Show More