From e5523288a55588b5d454796fa0937a55fe06292d Mon Sep 17 00:00:00 2001 From: chenminghui Date: Thu, 12 Sep 2024 16:15:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9A#IAQVWE=20=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0:distributed=5Faudio=E8=A7=A3=E8=80=A6device=5Fsecurit?= =?UTF-8?q?y=5Flevel=20=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0=EF=BC=9Adistri?= =?UTF-8?q?buted=5Faudio=E8=A7=A3=E8=80=A6device=5Fsecurity=5Flevel=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8E=A7=E5=88=B6=E5=AE=8F=E8=A7=A3=E8=80=A6?= =?UTF-8?q?device=5Fsecurity=5Flevel=20=E6=98=AF=E5=90=A6=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83=E8=87=AA=E6=A3=80?= =?UTF-8?q?=EF=BC=9AY=20=E6=98=AF=E5=90=A6=E7=BC=96=E8=AF=91=E4=B8=94?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9AY=20=E5=BD=B1?= =?UTF-8?q?=E5=93=8D=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=EF=BC=9Ark3568?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: chenminghui Change-Id: I449cb402d04d1fa2ae346e8838b5d03daec451d4 --- distributedaudio.gni | 6 ++++++ .../managersink/include/daudio_sink_manager.h | 2 ++ .../managersink/src/daudio_sink_manager.cpp | 4 ++++ services/audiomanager/servicesink/BUILD.gn | 6 +++++- .../audiomanager/test/unittest/managersink/BUILD.gn | 12 ++++++++++-- 5 files changed, 27 insertions(+), 3 deletions(-) diff --git a/distributedaudio.gni b/distributedaudio.gni index 9d64dc11..6320eeb7 100644 --- a/distributedaudio.gni +++ b/distributedaudio.gni @@ -47,4 +47,10 @@ build_flags = [ "-Werror" ] declare_args() { distributed_audio_extension_sa = false + device_security_level_control = true + + if (defined(global_parts_info) && + !defined(global_parts_info.security_device_security_level)) { + device_security_level_control = false + } } diff --git a/services/audiomanager/managersink/include/daudio_sink_manager.h b/services/audiomanager/managersink/include/daudio_sink_manager.h index e84c1291..07a4e734 100644 --- a/services/audiomanager/managersink/include/daudio_sink_manager.h +++ b/services/audiomanager/managersink/include/daudio_sink_manager.h @@ -22,8 +22,10 @@ #include "single_instance.h" #include "device_manager.h" #include "device_manager_callback.h" +#ifdef DEVICE_SECURITY_LEVEL_ENABLE #include "device_security_defines.h" #include "device_security_info.h" +#endif #include "daudio_sink_dev.h" #include "idaudio_source.h" diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index aef501e8..99d7aeea 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -453,6 +453,7 @@ bool DAudioSinkManager::CheckDeviceSecurityLevel(const std::string &srcDeviceId, int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) { + #ifdef DEVICE_SECURITY_LEVEL_ENABLE DeviceIdentify devIdentify; devIdentify.length = DEVICE_ID_MAX_LEN; int32_t ret = memcpy_s(devIdentify.identity, DEVICE_ID_MAX_LEN, udid.c_str(), DEVICE_ID_MAX_LEN); @@ -468,7 +469,9 @@ int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) info = nullptr; return DEFAULT_DEVICE_SECURITY_LEVEL; } + #endif int32_t level = 0; + #ifdef DEVICE_SECURITY_LEVEL_ENABLE ret = GetDeviceSecurityLevelValue(info, &level); DHLOGE("Get device security level, level is %{public}d", level); FreeDeviceSecurityInfo(info); @@ -477,6 +480,7 @@ int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) DHLOGE("Get device security level failed %{public}d", ret); return DEFAULT_DEVICE_SECURITY_LEVEL; } + #endif return level; } diff --git a/services/audiomanager/servicesink/BUILD.gn b/services/audiomanager/servicesink/BUILD.gn index 7d0ba2f8..fd205626 100755 --- a/services/audiomanager/servicesink/BUILD.gn +++ b/services/audiomanager/servicesink/BUILD.gn @@ -79,7 +79,6 @@ ohos_shared_library("distributed_audio_sink") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "device_security_level:dslm_sdk", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", @@ -101,6 +100,11 @@ ohos_shared_library("distributed_audio_sink") { "LOG_DOMAIN=0xD004130", ] + if (device_security_level_control) { + external_deps += [ "device_security_level:dslm_sdk" ] + defines += [ "DEVICE_SECURITY_LEVEL_ENABLE" ] + } + subsystem_name = "distributedhardware" part_name = "distributed_audio" diff --git a/services/audiomanager/test/unittest/managersink/BUILD.gn b/services/audiomanager/test/unittest/managersink/BUILD.gn index 2e90a403..790b5ad1 100644 --- a/services/audiomanager/test/unittest/managersink/BUILD.gn +++ b/services/audiomanager/test/unittest/managersink/BUILD.gn @@ -64,7 +64,6 @@ ohos_unittest("DaudioSinkDevTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "device_security_level:dslm_sdk", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", @@ -79,6 +78,11 @@ ohos_unittest("DaudioSinkDevTest") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + + if (device_security_level_control) { + external_deps += [ "device_security_level:dslm_sdk" ] + defines = [ "DEVICE_SECURITY_LEVEL_ENABLE" ] + } } ## UnitTest daudio_sink_manager_test @@ -101,7 +105,6 @@ ohos_unittest("DAudioSinkManagerTest") { "cJSON:cjson", "c_utils:utils", "device_manager:devicemanagersdk", - "device_security_level:dslm_sdk", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", @@ -114,6 +117,11 @@ ohos_unittest("DAudioSinkManagerTest") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + + if (device_security_level_control) { + external_deps += [ "device_security_level:dslm_sdk" ] + defines = [ "DEVICE_SECURITY_LEVEL_ENABLE" ] + } } group("manager_sink_test") { -- Gitee