From d6145bd8da8c32c52fa59f4bc5ffb330c58a926b Mon Sep 17 00:00:00 2001 From: chenminghui Date: Wed, 11 Sep 2024 10:00:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9A#IANGIF=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0:distributed=5Faudio=E8=A7=A3=E8=80=A6device?= =?UTF-8?q?=5Fsecurity=5Flevel=20=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0?= =?UTF-8?q?=EF=BC=9Adistributed=5Faudio=E8=A7=A3=E8=80=A6device=5Fsecurity?= =?UTF-8?q?=5Flevel=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BC=96=E8=AF=91=E6=8E=A7=E5=88=B6=E5=AE=8F?= =?UTF-8?q?=E8=A7=A3=E8=80=A6device=5Fsecurity=5Flevel=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=8C=E6=88=90=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=87=AA=E6=A3=80=EF=BC=9AY=20=E6=98=AF=E5=90=A6=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E4=B8=94=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9A?= =?UTF-8?q?Y=20=E5=BD=B1=E5=93=8D=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=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: I40cacd33d1c86e3bb7860efc83854b31a9e3a5c3 --- distributedaudio.gni | 9 +++++++++ .../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, 30 insertions(+), 3 deletions(-) diff --git a/distributedaudio.gni b/distributedaudio.gni index 06e5b9b9..ed90e095 100644 --- a/distributedaudio.gni +++ b/distributedaudio.gni @@ -44,3 +44,12 @@ innerkits_path = "${distributedaudio_path}/interfaces/inner_kits" distributedaudio_fuzz_path = "distributed_audio/distributed_audio" build_flags = [ "-Werror" ] + +declare_args() { + 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 a88bcba4..04a0c8fa 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 c05403b3..20db688f 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -415,6 +415,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); @@ -430,7 +431,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 %d", level); FreeDeviceSecurityInfo(info); @@ -439,6 +442,7 @@ int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) DHLOGE("Get device security level failed %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 02241542..f7153500 100755 --- a/services/audiomanager/servicesink/BUILD.gn +++ b/services/audiomanager/servicesink/BUILD.gn @@ -84,7 +84,6 @@ ohos_shared_library("distributed_audio_sink") { "audio_framework:audio_renderer", "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:libdhfwk_sdk", @@ -104,6 +103,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" ] + } + if (build_variant == "root") { defines += [ "DUMP_DMICCLIENT_FILE", diff --git a/services/audiomanager/test/unittest/managersink/BUILD.gn b/services/audiomanager/test/unittest/managersink/BUILD.gn index aa19c34c..d4cd1a38 100644 --- a/services/audiomanager/test/unittest/managersink/BUILD.gn +++ b/services/audiomanager/test/unittest/managersink/BUILD.gn @@ -74,7 +74,6 @@ ohos_unittest("DaudioSinkDevTest") { "audio_framework:audio_renderer", "c_utils:utils", "device_manager:devicemanagersdk", - "device_security_level:dslm_sdk", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "hdf_core:libhdf_ipc_adapter", @@ -85,6 +84,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 @@ -108,7 +112,6 @@ ohos_unittest("DAudioSinkManagerTest") { "audio_framework:audio_renderer", "c_utils:utils", "device_manager:devicemanagersdk", - "device_security_level:dslm_sdk", "distributed_hardware_fwk:distributed_av_receiver", "distributed_hardware_fwk:distributed_av_sender", "hdf_core:libhdf_ipc_adapter", @@ -119,6 +122,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 From a88f2e278ccd52a521fe562afe0a41fd58c2e96b Mon Sep 17 00:00:00 2001 From: chenminghui Date: Wed, 11 Sep 2024 10:12:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9A#IANGIF=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0:distributed=5Faudio=E8=A7=A3=E8=80=A6device?= =?UTF-8?q?=5Fsecurity=5Flevel=20=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0?= =?UTF-8?q?=EF=BC=9Adistributed=5Faudio=E8=A7=A3=E8=80=A6device=5Fsecurity?= =?UTF-8?q?=5Flevel=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BC=96=E8=AF=91=E6=8E=A7=E5=88=B6=E5=AE=8F?= =?UTF-8?q?=E8=A7=A3=E8=80=A6device=5Fsecurity=5Flevel=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=8C=E6=88=90=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=87=AA=E6=A3=80=EF=BC=9AY=20=E6=98=AF=E5=90=A6=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E4=B8=94=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9A?= =?UTF-8?q?Y=20=E5=BD=B1=E5=93=8D=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=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: I16302fc2f8e4f36fcd1ad6af99e3eb334cd90ae8 --- services/audiomanager/test/unittest/managersink/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/audiomanager/test/unittest/managersink/BUILD.gn b/services/audiomanager/test/unittest/managersink/BUILD.gn index d4cd1a38..68ee95cc 100644 --- a/services/audiomanager/test/unittest/managersink/BUILD.gn +++ b/services/audiomanager/test/unittest/managersink/BUILD.gn @@ -85,7 +85,7 @@ ohos_unittest("DaudioSinkDevTest") { "samgr:samgr_proxy", ] - if (device_security_level_control){ + if (device_security_level_control) { external_deps += [ "device_security_level:dslm_sdk" ] defines = [ "DEVICE_SECURITY_LEVEL_ENABLE" ] } @@ -123,7 +123,7 @@ ohos_unittest("DAudioSinkManagerTest") { "samgr:samgr_proxy", ] - if (device_security_level_control){ + if (device_security_level_control) { external_deps += [ "device_security_level:dslm_sdk" ] defines = [ "DEVICE_SECURITY_LEVEL_ENABLE" ] } -- Gitee From 42151d911f15d7c358bf6bb283efdaddb3e55e15 Mon Sep 17 00:00:00 2001 From: chenminghui Date: Sat, 14 Sep 2024 12:37:49 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=95=E5=8F=B7=EF=BC=9A#IANGIF=20?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0:distributed=5Faudio=E8=A7=A3=E8=80=A6device?= =?UTF-8?q?=5Fsecurity=5Flevel=20=E9=97=AE=E9=A2=98=E6=A0=B9=E5=9B=A0?= =?UTF-8?q?=EF=BC=9Adistributed=5Faudio=E8=A7=A3=E8=80=A6device=5Fsecurity?= =?UTF-8?q?=5Flevel=20=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=EF=BC=9A?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=BC=96=E8=AF=91=E6=8E=A7=E5=88=B6=E5=AE=8F?= =?UTF-8?q?=E8=A7=A3=E8=80=A6device=5Fsecurity=5Flevel=20=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=AE=8C=E6=88=90=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=87=AA=E6=A3=80=EF=BC=9AY=20=E6=98=AF=E5=90=A6=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E4=B8=94=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9A?= =?UTF-8?q?Y=20=E5=BD=B1=E5=93=8D=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=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: Iab0f1cf94a2d5a5ebdec1ad0c42b4ba5a2add281 --- .../audiomanager/managersink/src/daudio_sink_manager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/audiomanager/managersink/src/daudio_sink_manager.cpp b/services/audiomanager/managersink/src/daudio_sink_manager.cpp index 20db688f..86841c7a 100644 --- a/services/audiomanager/managersink/src/daudio_sink_manager.cpp +++ b/services/audiomanager/managersink/src/daudio_sink_manager.cpp @@ -415,7 +415,7 @@ bool DAudioSinkManager::CheckDeviceSecurityLevel(const std::string &srcDeviceId, int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) { - #ifdef DEVICE_SECURITY_LEVEL_ENABLE +#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); @@ -431,9 +431,9 @@ int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) info = nullptr; return DEFAULT_DEVICE_SECURITY_LEVEL; } - #endif +#endif int32_t level = 0; - #ifdef DEVICE_SECURITY_LEVEL_ENABLE +#ifdef DEVICE_SECURITY_LEVEL_ENABLE ret = GetDeviceSecurityLevelValue(info, &level); DHLOGE("Get device security level, level is %d", level); FreeDeviceSecurityInfo(info); @@ -442,7 +442,7 @@ int32_t DAudioSinkManager::GetDeviceSecurityLevel(const std::string &udid) DHLOGE("Get device security level failed %d", ret); return DEFAULT_DEVICE_SECURITY_LEVEL; } - #endif +#endif return level; } -- Gitee