From 33be70560db8b0d9e6a3667ad681818ec7cdcc4a Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Thu, 17 Jul 2025 18:29:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9E=E6=B3=95=E7=BB=84?= =?UTF-8?q?=E7=BD=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gaoqiang_strong --- common/include/dm_constants.h | 2 -- common/src/dm_constants.cpp | 2 -- .../include/i_dm_device_risk_detect.h | 3 +-- .../service/src/device_manager_service.cpp | 22 ++++--------------- 4 files changed, 5 insertions(+), 24 deletions(-) diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index 1edd72def..901a30b7a 100755 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -171,8 +171,6 @@ DM_EXPORT extern const char* DM_VAL_FALSE; DM_EXPORT extern const char* APP_USER_DATA; DM_EXPORT extern const char* BUNDLE_INFO; DM_EXPORT extern const char* DM_BUSINESS_ID; -DM_EXPORT extern const char* DM_RISK; -DM_EXPORT extern const char* DM_SAFE; // screen state enum ScreenState { diff --git a/common/src/dm_constants.cpp b/common/src/dm_constants.cpp index f8bfb729b..5a2632e9d 100644 --- a/common/src/dm_constants.cpp +++ b/common/src/dm_constants.cpp @@ -161,8 +161,6 @@ const char* DM_VAL_FALSE = "false"; const char* APP_USER_DATA = "appUserData"; const char* BUNDLE_INFO = "bundleInfo"; const char* DM_BUSINESS_ID = "business_id"; -const char* DM_RISK = "risk"; -const char* DM_SAFE = "safe"; // errCode map const std::map MAP_ERROR_CODE = { diff --git a/interfaces/inner_kits/native_cpp/include/i_dm_device_risk_detect.h b/interfaces/inner_kits/native_cpp/include/i_dm_device_risk_detect.h index 097f607b0..d27b90d86 100644 --- a/interfaces/inner_kits/native_cpp/include/i_dm_device_risk_detect.h +++ b/interfaces/inner_kits/native_cpp/include/i_dm_device_risk_detect.h @@ -21,8 +21,7 @@ public: virtual ~IDMDeviceRiskDetect() = default; virtual int32_t Initialize() = 0; virtual int32_t Release() = 0; - virtual int32_t DetectDeviceRisk(std::string &efuse, std::string &fastbootLock, - std::string &processPrivilege, std::string &rootPackage) = 0; + virtual bool IsDeviceHasRisk() = 0; }; using CreateDMDeviceRiskDetectFuncPtr = IDMDeviceRiskDetect *(*)(void); diff --git a/services/service/src/device_manager_service.cpp b/services/service/src/device_manager_service.cpp index f68075c02..fb4b035bf 100644 --- a/services/service/src/device_manager_service.cpp +++ b/services/service/src/device_manager_service.cpp @@ -169,27 +169,13 @@ void DeviceManagerService::StartDetectDeviceRisk() LOGE("load dm device risk detect failed."); return; } - std::string efuse; - std::string fastbootLock; - std::string processPrivilege; - std::string rootPackage; - int32_t ret = dmDeviceRiskDetect_->DetectDeviceRisk(efuse, fastbootLock, processPrivilege, rootPackage); - if (ret != DM_OK) { - LOGE("DetectDeviceRisk failed. ret:%{public}d", ret); - return; - } - LOGI("efuse:%{public}s, fastbootLock:%{public}s, processPrivilege:%{public}s, rootPackage:%{public}s", - efuse.c_str(), fastbootLock.c_str(), processPrivilege.c_str(), rootPackage.c_str()); - if (efuse == DM_RISK || (efuse == DM_SAFE && fastbootLock == DM_RISK)) { - LOGI("device status is development"); - return; - } else if (processPrivilege == DM_RISK || rootPackage == DM_RISK) { + + bool isRisk = dmDeviceRiskDetect_->IsDeviceHasRisk(); + if (isRisk) { LOGI("device status is Illegal"); DelAllRelateShip(); - } else { - LOGI("device status is Commercial"); - return; } + return; } void DeviceManagerService::DelAllRelateShip() -- Gitee