From f8ede38045e0671d45ae39d9113fccf2feb7e95f Mon Sep 17 00:00:00 2001 From: yuqianyuan Date: Wed, 3 Nov 2021 09:27:00 +0800 Subject: [PATCH] to connect huawei phone Signed-off-by: yuqianyuan --- .../devicemanagerservice/include/softbus/softbus_session.h | 4 ++-- services/devicemanagerservice/src/auth/hichain_connector.cpp | 2 +- .../devicemanagerservice/src/message/msg_request_auth.cpp | 2 +- services/devicemanagerservice/src/softbus/softbus_adapter.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/devicemanagerservice/include/softbus/softbus_session.h b/services/devicemanagerservice/include/softbus/softbus_session.h index 03610be2c..71b699376 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 = "ohos.distributedhardware.devicemanager"; - const char *SESSION_NAME = "ohos.distributedhardware.devicemanager.resident"; + const char *PKG_NAME = "com.huawei.devicemanager"; + const char *SESSION_NAME = "com.huawei.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 88516aebd..fdc68e179 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 = "ohos.distributedhardware.devicemanager"; +const std::string DEVICE_MANAGER_APP = "com.huawei.devicemanager"; const std::string DEVICE_MANAGER_GROUPNAME = "DMPeerToPeerGroup"; const int64_t MIN_REQUEST_ID = 1000000000; diff --git a/services/devicemanagerservice/src/message/msg_request_auth.cpp b/services/devicemanagerservice/src/message/msg_request_auth.cpp index d902d86fa..216030d71 100644 --- a/services/devicemanagerservice/src/message/msg_request_auth.cpp +++ b/services/devicemanagerservice/src/message/msg_request_auth.cpp @@ -48,7 +48,7 @@ MsgRequestAuth::MsgRequestAuth(std::string &token, std::string hostPkgName, std: mAuthType_ = jsonObject.contains(AUTH_TYPE) ? (int32_t)jsonObject[AUTH_TYPE] : AUTH_TYPE_QR; mHead_ = std::make_shared((mAuthType_ == AUTH_TYPE_QR) ? (DmMsgType::MSG_TYPE_REQ_AUTH) : (DmMsgType::MSG_TYPE_AUTH_BY_PIN)); - std::string deviceManagerPkgName = "ohos.distributedhardware.devicemanager"; + std::string deviceManagerPkgName = "com.huawei.devicemanager"; NodeBasicInfo localBasicInfo; int32_t ret = GetLocalNodeDeviceInfo(deviceManagerPkgName.c_str(), &localBasicInfo); if (ret != 0) { diff --git a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp index f5da3a1a3..4db2ad209 100644 --- a/services/devicemanagerservice/src/softbus/softbus_adapter.cpp +++ b/services/devicemanagerservice/src/softbus/softbus_adapter.cpp @@ -37,7 +37,7 @@ namespace OHOS { namespace DistributedHardware { namespace { -const std::string DEVICE_MANAGER_PACKAGE_NAME = "ohos.distributedhardware.devicemanager"; +const std::string DEVICE_MANAGER_PACKAGE_NAME = "com.huawei.devicemanager"; const char *DM_CAPABILITY_OSD = "osdCapability"; const int32_t CHECK_INTERVAL = 100000; // 100ms const uint32_t SUBSCRIBE_ID_PREFIX_LEN = 16; -- Gitee