From d2626021d46b1e3577881c555bce2128c7835506 Mon Sep 17 00:00:00 2001 From: yuqianyuan Date: Sun, 26 Sep 2021 19:12:10 +0800 Subject: [PATCH] change session name Signed-off-by: yuqianyuan --- devicemanager.gni | 1 - .../devicemanagerservice/include/softbus/softbus_session.h | 4 ++-- services/devicemanagerservice/src/auth/hichain_connector.cpp | 2 +- services/devicemanagerservice/src/softbus/softbus_adapter.cpp | 2 +- test/unittest/BUILD.gn | 1 - 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/devicemanager.gni b/devicemanager.gni index fee9560c8..90d398188 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -21,4 +21,3 @@ services_path = "${devicemanager_path}/services" innerkits_path = "${devicemanager_path}/interfaces/inner_kits" -build_flags = [ "-Werror" ] diff --git a/services/devicemanagerservice/include/softbus/softbus_session.h b/services/devicemanagerservice/include/softbus/softbus_session.h index 002a780d0..03610be2c 100644 --- a/services/devicemanagerservice/include/softbus/softbus_session.h +++ b/services/devicemanagerservice/include/softbus/softbus_session.h @@ -43,8 +43,8 @@ private: private: int32_t SendData(int32_t sessionId, const void *data, int32_t len); private: - const char *PKG_NAME = "com.ohos.devicemanager"; - const char *SESSION_NAME = "com.ohos.devicemanager.resident"; + const char *PKG_NAME = "ohos.distributedhardware.devicemanager"; + const char *SESSION_NAME = "ohos.distributedhardware.devicemanager.resident"; std::set sessionIdSet_; std::vector messages_ {}; }; diff --git a/services/devicemanagerservice/src/auth/hichain_connector.cpp b/services/devicemanagerservice/src/auth/hichain_connector.cpp index 435f68061..d0e868e05 100644 --- a/services/devicemanagerservice/src/auth/hichain_connector.cpp +++ b/services/devicemanagerservice/src/auth/hichain_connector.cpp @@ -46,7 +46,7 @@ const std::string BR_MAC = "BR_MAC"; const std::string BLE_MAC = "BLE_MAC"; const std::string ETH_IP = "ETH_IP"; const std::string ETH_PORT = "ETH_PORT"; -const std::string DEVICE_MANAGER_APP = "com.ohos.devicemanager"; +const std::string DEVICE_MANAGER_APP = "ohos.distributedhardware.devicemanager"; const std::string DEVICE_MANAGER_GROUPNAME = "DMPeerToPeerGroup"; const int64_t MIN_REQUEST_ID = 1000000000; diff --git a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp index ad39578b4..aa7c01dcf 100644 --- a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp +++ b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp @@ -40,7 +40,7 @@ namespace OHOS { namespace DistributedHardware { namespace { -const std::string DEVICE_MANAGER_PACKAGE_NAME = "com.ohos.devicemanager"; +const std::string DEVICE_MANAGER_PACKAGE_NAME = "ohos.distributedhardware.devicemanager"; const int32_t CHECK_INTERVAL = 100000; // 100ms const uint32_t SUBSCRIBE_ID_PREFIX_LEN = 16; const int32_t SUBSCRIBE_ID_MASK = 0x0000FFFF; diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index 9c2c9dcce..641872d88 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -51,7 +51,6 @@ config("device_manager_test_common_public_config") { cflags = [ "-Wall", - "-Werror", "-g3", "-Dprivate=public", "-Dprotected=public", -- Gitee