From dbebeeb6375f176041b6e307ddc9fc73342b2ddd Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Fri, 18 Oct 2024 15:52:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E3=80=81=E6=B7=BB=E5=8A=A0modem=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=9B=9E=E5=90=885.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- sa_profile/dhardware.cfg | 3 ++- .../src/distributed_hardware_manager.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/sa_profile/dhardware.cfg b/sa_profile/dhardware.cfg index 46561e1a..68ad964f 100644 --- a/sa_profile/dhardware.cfg +++ b/sa_profile/dhardware.cfg @@ -27,7 +27,8 @@ "ohos.permission.GET_TELEPHONY_STATE", "ohos.permission.MANAGE_SECURE_SETTINGS", "ohos.permission.ACCESS_BLUETOOTH", - "ohos.permission.GET_WIFI_INFO" + "ohos.permission.GET_WIFI_INFO", + "ohos.permission.ACCESS_DISTRIBUTED_MODEM" ], "permission_acls" : ["ohos.permission.MONITOR_DEVICE_NETWORK_STATE"], "jobs" : { diff --git a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp index 5348135a..7280add3 100644 --- a/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp +++ b/services/distributedhardwarefwkservice/src/distributed_hardware_manager.cpp @@ -47,7 +47,7 @@ IMPLEMENT_SINGLE_INSTANCE(DistributedHardwareManager); int32_t DistributedHardwareManager::LocalInit() { DHLOGI("DHFWK Local Init begin"); - if (isLocalInit_) { + if (isLocalInit_.load()) { DHLOGI("Local init already finish"); return DH_FWK_SUCCESS; } @@ -60,7 +60,7 @@ int32_t DistributedHardwareManager::LocalInit() LocalHardwareManager::GetInstance().Init(); DeviceParamMgr::GetInstance().QueryDeviceDataSyncMode(); DHLOGI("DHFWK Local Init end"); - isLocalInit_ = true; + isLocalInit_.store(true); return DH_FWK_SUCCESS; } @@ -68,14 +68,14 @@ int32_t DistributedHardwareManager::Initialize() { DHLOGI("DHFWK Normal Init begin"); std::lock_guard lock(dhInitMgrMutex_); - if (isAllInit_) { + if (isAllInit_.load()) { DHLOGI("DHMgr init already finish"); return DH_FWK_SUCCESS; } LocalInit(); ComponentManager::GetInstance().Init(); DHLOGI("DHFWK Normal Init end"); - isAllInit_ = true; + isAllInit_.store(true); return DH_FWK_SUCCESS; } -- Gitee