From cbb2736b160a4dfef2e6b093d802cb20d9a021b8 Mon Sep 17 00:00:00 2001 From: hobbycao Date: Wed, 16 Mar 2022 11:50:47 +0800 Subject: [PATCH] modify softbus pkg name Signed-off-by: hobbycao --- common/include/constants/distributed_camera_constants.h | 2 +- services/channel/include/dcamera_channel_sink_impl.h | 2 +- services/channel/include/dcamera_channel_source_impl.h | 2 +- services/channel/include/dcamera_softbus_adapter.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/include/constants/distributed_camera_constants.h b/common/include/constants/distributed_camera_constants.h index bc12251..d89ffa2 100644 --- a/common/include/constants/distributed_camera_constants.h +++ b/common/include/constants/distributed_camera_constants.h @@ -74,7 +74,7 @@ const uint32_t DCAMERA_PRODUCER_FPS_DEFAULT = 30; const uint32_t DCAMERA_MAX_RECV_DATA_LEN = 104857600; const uint32_t DISTRIBUTED_HARDWARE_CAMERA_SOURCE_SA_ID = 4803; const uint32_t DISTRIBUTED_HARDWARE_CAMERA_SINK_SA_ID = 4804; -const std::string DCAMERA_PKG_NAME = "DBinderBus_" + std::to_string(getpid()); +const std::string DCAMERA_PKG_NAME = "ohos.dhardware"; const std::string SNAP_SHOT_SESSION_FLAG = "dataSnapshot"; const std::string CONTINUE_SESSION_FLAG = "dataContinue"; diff --git a/services/channel/include/dcamera_channel_sink_impl.h b/services/channel/include/dcamera_channel_sink_impl.h index d276d11..7755a0e 100644 --- a/services/channel/include/dcamera_channel_sink_impl.h +++ b/services/channel/include/dcamera_channel_sink_impl.h @@ -39,7 +39,7 @@ private: std::shared_ptr softbusSession_; std::string mySessionName_; DCameraSessionMode mode_; - const std::string SESSION_HEAD = "DBinder.ohos.dhardware.dcamera_"; + const std::string SESSION_HEAD = "ohos.dhardware.dcamera_"; }; } } diff --git a/services/channel/include/dcamera_channel_source_impl.h b/services/channel/include/dcamera_channel_source_impl.h index f12b530..ee96ab2 100644 --- a/services/channel/include/dcamera_channel_source_impl.h +++ b/services/channel/include/dcamera_channel_source_impl.h @@ -39,7 +39,7 @@ private: std::vector> softbusSessions_; std::string mySessionName_; DCameraSessionMode mode_; - const std::string SESSION_HEAD = "DBinder.ohos.dhardware.dcamera_"; + const std::string SESSION_HEAD = "ohos.dhardware.dcamera_"; }; } } diff --git a/services/channel/include/dcamera_softbus_adapter.h b/services/channel/include/dcamera_softbus_adapter.h index 79c3960..123c8f5 100644 --- a/services/channel/include/dcamera_softbus_adapter.h +++ b/services/channel/include/dcamera_softbus_adapter.h @@ -72,7 +72,7 @@ private: private: std::mutex optLock_; - const string PKG_NAME = "DBinderBus_" + std::to_string(getpid()); + const string PKG_NAME = "ohos.dhardware"; static const uint32_t DCAMERA_SESSION_NAME_MAX_LEN = 128; map sessListeners_; std::map sessionTotal_;