From 03641b7e51a49072add7ec2387b2341fbb43a9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E5=BC=BA345?= Date: Wed, 3 Sep 2025 06:19:23 +0000 Subject: [PATCH 1/6] update wifi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黎强345 --- .../wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp index e6172735b..21b80713f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp @@ -915,7 +915,7 @@ ErrCode WifiDeviceServiceImpl::EnableDeviceConfig(int networkId, bool attemptEna return WIFI_OPT_PERMISSION_DENIED; } - if (!IsStaServiceRunning()) { + if (!IsStaServiceRunning() && !IsWifiBrokerProcess(GetCallingUid())) { return WIFI_OPT_STA_NOT_OPENED; } -- Gitee From cf53e046b9696d7904466d9d06357f70be07d587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E5=BC=BA345?= Date: Wed, 3 Sep 2025 06:45:19 +0000 Subject: [PATCH 2/6] update wifi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黎强345 --- .../wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp index 21b80713f..2eae8dab8 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp @@ -915,7 +915,7 @@ ErrCode WifiDeviceServiceImpl::EnableDeviceConfig(int networkId, bool attemptEna return WIFI_OPT_PERMISSION_DENIED; } - if (!IsStaServiceRunning() && !IsWifiBrokerProcess(GetCallingUid())) { + if (!IsStaServiceRunning()) {//test return WIFI_OPT_STA_NOT_OPENED; } -- Gitee From af70c2b4ce1ac70c57c73132d80ff832c7d58a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E5=BC=BA345?= Date: Wed, 3 Sep 2025 07:41:37 +0000 Subject: [PATCH 3/6] update wifi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黎强345 --- .../wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp index 2eae8dab8..21b80713f 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp @@ -915,7 +915,7 @@ ErrCode WifiDeviceServiceImpl::EnableDeviceConfig(int networkId, bool attemptEna return WIFI_OPT_PERMISSION_DENIED; } - if (!IsStaServiceRunning()) {//test + if (!IsStaServiceRunning() && !IsWifiBrokerProcess(GetCallingUid())) { return WIFI_OPT_STA_NOT_OPENED; } -- Gitee From 59a3de9d330b3e7d6d9cd540c3666bca004065cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E5=BC=BA345?= Date: Wed, 3 Sep 2025 08:12:58 +0000 Subject: [PATCH 4/6] update wifi/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黎强345 --- .../wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp index 21b80713f..b396c4e33 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp @@ -915,7 +915,7 @@ ErrCode WifiDeviceServiceImpl::EnableDeviceConfig(int networkId, bool attemptEna return WIFI_OPT_PERMISSION_DENIED; } - if (!IsStaServiceRunning() && !IsWifiBrokerProcess(GetCallingUid())) { + if (!IsStaServiceRunning() && IsWifiBrokerProcess(GetCallingUid())) { return WIFI_OPT_STA_NOT_OPENED; } -- Gitee From fab02cd57b09c8412fcc14ae2b1acccc996e9255 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E5=BC=BA345?= Date: Thu, 4 Sep 2025 01:09:59 +0000 Subject: [PATCH 5/6] update wifi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黎强345 --- .../wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp index b396c4e33..e78fd1afe 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp @@ -915,8 +915,13 @@ ErrCode WifiDeviceServiceImpl::EnableDeviceConfig(int networkId, bool attemptEna return WIFI_OPT_PERMISSION_DENIED; } - if (!IsStaServiceRunning() && IsWifiBrokerProcess(GetCallingUid())) { - return WIFI_OPT_STA_NOT_OPENED; + if (!IsStaServiceRunning()) { + int uid = 0; + if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { + if (!IsWifiBrokerProcess(uid)) { + return WIFI_OPT_STA_NOT_OPENED; + } + } } if (networkId < 0) { -- Gitee From 7ddd08cbe9bf752f6f263c034206e69d6ab9a391 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=8E=E5=BC=BA345?= Date: Thu, 4 Sep 2025 02:06:13 +0000 Subject: [PATCH 6/6] update wifi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 黎强345 --- .../wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp index e78fd1afe..c3b915e4e 100644 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta_sa/wifi_device_service_impl.cpp @@ -917,10 +917,9 @@ ErrCode WifiDeviceServiceImpl::EnableDeviceConfig(int networkId, bool attemptEna if (!IsStaServiceRunning()) { int uid = 0; - if (CheckCallingUid(uid) != WIFI_OPT_SUCCESS) { - if (!IsWifiBrokerProcess(uid)) { - return WIFI_OPT_STA_NOT_OPENED; - } + CheckCallingUid(uid); + if (!IsWifiBrokerProcess(uid)) { + return WIFI_OPT_STA_NOT_OPENED; } } -- Gitee