From 8f7fbdc6033f231c85ba5d88174e621c283dac3f Mon Sep 17 00:00:00 2001 From: zqz Date: Mon, 26 May 2025 21:16:51 +0800 Subject: [PATCH] Signed-off-by: zqz Change-Id: I4d1cb5b3eaaedfd624e1fcb1a853346a67eb224a Signed-off-by: zqz Change-Id: I8b1518a6173136777b662fff84db9932daf37551 Signed-off-by: zqz --- wifi/base/utils/wifi_datashare_utils.cpp | 4 ++-- wifi/base/utils/wifi_datashare_utils.h | 4 ++-- wifi/bundle.json | 1 + .../wifi_standard/wifi_framework/wifi_manage/BUILD.gn | 2 +- .../wifi_framework/wifi_manage/wifi_common/BUILD.gn | 2 +- .../wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h | 2 +- wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn | 2 +- wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn | 2 +- wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn | 2 +- wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn | 2 +- wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn | 2 +- wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn | 2 +- wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn | 2 +- wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn | 2 +- wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn | 2 +- .../wifi_framework/wifi_manage/unittest/BUILD.gn | 2 +- .../wifi_manage/unittest/common/wifi_datashare_utils_test.cpp | 2 +- .../wifi_framework/wifi_manage/wifi_scan/BUILD.gn | 2 +- 18 files changed, 20 insertions(+), 19 deletions(-) diff --git a/wifi/base/utils/wifi_datashare_utils.cpp b/wifi/base/utils/wifi_datashare_utils.cpp index 92e659adb..ff88f2592 100644 --- a/wifi/base/utils/wifi_datashare_utils.cpp +++ b/wifi/base/utils/wifi_datashare_utils.cpp @@ -207,7 +207,7 @@ ErrCode WifiDataShareHelperUtils::Update(Uri &uri, const std::string &key, const return WIFI_OPT_SUCCESS; } -ErrCode WifiDataShareHelperUtils::RegisterObserver(const Uri &uri, const sptr &observer) +ErrCode WifiDataShareHelperUtils::RegisterObserver(const Uri &uri, const sptr &observer) { std::shared_ptr registerHelper = WifiCreateDataShareHelper(); CHECK_NULL_AND_RETURN(registerHelper, WIFI_OPT_FAILED); @@ -217,7 +217,7 @@ ErrCode WifiDataShareHelperUtils::RegisterObserver(const Uri &uri, const sptr &observer) +ErrCode WifiDataShareHelperUtils::UnRegisterObserver(const Uri &uri, const sptr &observer) { std::shared_ptr unregisterHelper = WifiCreateDataShareHelper(); CHECK_NULL_AND_RETURN(unregisterHelper, WIFI_OPT_FAILED); diff --git a/wifi/base/utils/wifi_datashare_utils.h b/wifi/base/utils/wifi_datashare_utils.h index b54ea67b5..169a7ac3e 100644 --- a/wifi/base/utils/wifi_datashare_utils.h +++ b/wifi/base/utils/wifi_datashare_utils.h @@ -113,7 +113,7 @@ public: * @param value - value * @return Register observer error code */ - ErrCode RegisterObserver(const Uri &uri, const sptr &observer); + ErrCode RegisterObserver(const Uri &uri, const sptr &observer); /** * @Description : Unregister observer function @@ -123,7 +123,7 @@ public: * @param value - value * @return Unregister observer error code */ - ErrCode UnRegisterObserver(const Uri &uri, const sptr &observer); + ErrCode UnRegisterObserver(const Uri &uri, const sptr &observer); std::string GetLoactionDataShareUri(); std::string GetScanMacInfoWhiteListDataShareUri(); diff --git a/wifi/bundle.json b/wifi/bundle.json index 4dd441682..d5b9b37a1 100644 --- a/wifi/bundle.json +++ b/wifi/bundle.json @@ -94,6 +94,7 @@ "common_event_service", "core_service", "data_share", + "datamgr_service", "dhcp", "distributed_notification_service", "drivers_interface_wlan", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn index bda75a337..3b1bb0f4e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/BUILD.gn @@ -539,7 +539,6 @@ if (defined(ohos_lite)) { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -548,6 +547,7 @@ if (defined(ohos_lite)) { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "ipc:ipc_single", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn index a04662c67..690dfccd8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_common/BUILD.gn @@ -188,7 +188,6 @@ if (defined(ohos_lite)) { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:extension_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", @@ -198,6 +197,7 @@ if (defined(ohos_lite)) { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "hilog:libhilog", "ipc:ipc_single", "libxml2:libxml2", diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h index 3a13978ec..ba1996253 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sub_manage/wifi_location_mode_observer.h @@ -20,7 +20,7 @@ namespace OHOS { namespace Wifi { -class WifiLocationModeObserver : public AAFwk::DataAbilityObserverStub { +class WifiLocationModeObserver : public DataShare::DataAbilityObserverStub { public: WifiLocationModeObserver() = default; diff --git a/wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn index da54f4b20..1fe5290b1 100644 --- a/wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/enablep2p_fuzzer/BUILD.gn @@ -195,7 +195,6 @@ ohos_fuzztest("EnableP2pFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -207,6 +206,7 @@ ohos_fuzztest("EnableP2pFuzzTest") { "core_service:tel_core_service_api", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "init:libbegetutil", diff --git a/wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn index 9f677ca7d..c18cc0d76 100644 --- a/wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/wifidevicestub_fuzzer/BUILD.gn @@ -103,7 +103,6 @@ ohos_fuzztest("WifiDeviceStubFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -112,6 +111,7 @@ ohos_fuzztest("WifiDeviceStubFuzzTest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "ipc:ipc_single", diff --git a/wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn index 4abeaf358..5471816eb 100644 --- a/wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/wifihotspotimpl_fuzzer/BUILD.gn @@ -101,7 +101,6 @@ ohos_fuzztest("WifiHotspotImplFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -110,6 +109,7 @@ ohos_fuzztest("WifiHotspotImplFuzzTest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "ipc:ipc_single", diff --git a/wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn index cfee20375..d2f6cc1d3 100644 --- a/wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/wifihotspotstub_fuzzer/BUILD.gn @@ -101,7 +101,6 @@ ohos_fuzztest("WifiHotSpotStubFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -110,6 +109,7 @@ ohos_fuzztest("WifiHotSpotStubFuzzTest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "ipc:ipc_single", diff --git a/wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn index 02202c305..2a62ff3e8 100644 --- a/wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/wifip2pserver_fuzzer/BUILD.gn @@ -137,7 +137,6 @@ ohos_fuzztest("WifiP2pServerFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -146,6 +145,7 @@ ohos_fuzztest("WifiP2pServerFuzzTest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "ipc:ipc_single", diff --git a/wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn index 8eddbc726..b77aa3f85 100644 --- a/wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/wifip2pstub_fuzzer/BUILD.gn @@ -100,7 +100,6 @@ ohos_fuzztest("WifiP2pStubFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -109,6 +108,7 @@ ohos_fuzztest("WifiP2pStubFuzzTest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "ipc:ipc_single", diff --git a/wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn index c3671ed52..7d5610179 100644 --- a/wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/wifiscansa_fuzzer/BUILD.gn @@ -112,7 +112,6 @@ ohos_fuzztest("WifiScansaFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -121,6 +120,7 @@ ohos_fuzztest("WifiScansaFuzzTest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "drivers_interface_wlan:libchip_proxy_2.0", "drivers_interface_wlan:libhostapd_proxy_1.0", diff --git a/wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn index 2a2029ee3..9f5f8ef17 100644 --- a/wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/wifiscanserver_fuzzer/BUILD.gn @@ -109,7 +109,6 @@ ohos_fuzztest("WifiScanServerFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -119,6 +118,7 @@ ohos_fuzztest("WifiScanServerFuzzTest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "ipc:ipc_single", diff --git a/wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn b/wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn index 391e42092..fee14f89d 100644 --- a/wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn +++ b/wifi/test/fuzztest/wifi_sta/wifiscanstub_fuzzer/BUILD.gn @@ -101,7 +101,6 @@ ohos_fuzztest("WifiScanStubFuzzTest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", "bundle_framework:appexecfwk_base", @@ -110,6 +109,7 @@ ohos_fuzztest("WifiScanStubFuzzTest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "hilog:libhilog", "ipc:ipc_single", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn index 336a232eb..db6a330f9 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/BUILD.gn @@ -197,7 +197,6 @@ ohos_unittest("manager_unittest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:extension_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", @@ -208,6 +207,7 @@ ohos_unittest("manager_unittest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "googletest:gmock_main", "googletest:gtest_main", diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/common/wifi_datashare_utils_test.cpp b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/common/wifi_datashare_utils_test.cpp index e1a32fdb1..8b13e0968 100755 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/common/wifi_datashare_utils_test.cpp +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/unittest/common/wifi_datashare_utils_test.cpp @@ -33,7 +33,7 @@ using ::testing::ext::TestSize; namespace OHOS { namespace Wifi { const std::string g_errLog = "wifitest"; -class WifiMockModeObserver : public AAFwk::DataAbilityObserverStub { +class WifiMockModeObserver : public DataShare::DataAbilityObserverStub { public: WifiMockModeObserver() = default; diff --git a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn index d867872a8..ee8d2c977 100644 --- a/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn +++ b/wifi/test/wifi_standard/wifi_framework/wifi_manage/wifi_scan/BUILD.gn @@ -146,7 +146,6 @@ ohos_unittest("wifi_scan_unittest") { "ability_runtime:app_context", "ability_runtime:app_manager", "ability_runtime:connection_obs_manager", - "ability_runtime:dataobs_manager", "ability_runtime:extension_manager", "ability_runtime:wantagent_innerkits", "access_token:libaccesstoken_sdk", @@ -156,6 +155,7 @@ ohos_unittest("wifi_scan_unittest") { "common_event_service:cesfwk_innerkits", "data_share:datashare_common", "data_share:datashare_consumer", + "datamgr_service:dataobs_manager", "dhcp:dhcp_sdk", "googletest:gmock_main", "googletest:gtest_main", -- Gitee