openharmony/distributedschedule_samgr
1
0
Fork 0
mirror of https://github.com/openharmony/distributedschedule_samgr.git synced 2026-07-19 19:33:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix codecheck

Browse Source 
Signed-off-by: zhangmingxiang <zhangmingxiang@huawei.com>
Change-Id: Ia179f58f896b3830653132cf50d52afdc9f31803
Signed-off-by: zhangmingxiang <zhangmingxiang@huawei.com>
This commit is contained in:
zhangmingxiang
2022-07-06 10:35:08 +08:00
parent 3e2e7b7430
commit 7ec14fad10
3 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/dtbabilitymgr/include/distributed_ability_manager_service.h
+1
View File
@@ -80,6 +80,7 @@ private:
bool InitDmsImplFunc();
using LibHandle = void*;
LibHandle dmsImplHandle_ = nullptr;
bool InitFunc();
using OnStartFunc = void(*)();
using OnRemoteRequestFunc = int32_t(*)(uint32_t code, MessageParcel& data, MessageParcel& reply,
services/dtbabilitymgr/src/distributed_ability_manager_proxy.cpp
+9 -9
View File
@@ -33,7 +33,7 @@ int32_t DistributedAbilityManagerProxy::Register(
HILOGD("called.");
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOGE("remote is null");
HILOGE("Register remote is null");
return ERR_NULL_OBJECT;
}
MessageParcel data;
@@ -67,7 +67,7 @@ int32_t DistributedAbilityManagerProxy::Unregister(int32_t token)
HILOGD("called.");
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOGE("remote is null");
HILOGE("Unregister remote is null");
return ERR_NULL_OBJECT;
}
MessageParcel data;
@@ -84,16 +84,16 @@ int32_t DistributedAbilityManagerProxy::RegisterDeviceSelectionCallback(
{
HILOGD("called.");
if (cbType.empty()) {
HILOGE("cbType is empty");
HILOGE("RegisterDeviceSelectionCallback cbType is empty");
return ERR_NULL_OBJECT;
}
if (notifier == nullptr) {
HILOGE("notifier is nullptr");
HILOGE("RegisterDeviceSelectionCallback notifier is nullptr");
return ERR_NULL_OBJECT;
}
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOGE("remote is null");
HILOGE("RegisterDeviceSelectionCallback remote is null");
return ERR_NULL_OBJECT;
}
@@ -112,12 +112,12 @@ int32_t DistributedAbilityManagerProxy::UnregisterDeviceSelectionCallback(int32_
{
HILOGD("called.");
if (cbType.empty()) {
HILOGE("cbType is empty");
HILOGE("UnregisterDeviceSelectionCallback cbType is empty");
return ERR_NULL_OBJECT;
}
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOGE("remote is null");
HILOGE("UnregisterDeviceSelectionCallback remote is null");
return ERR_NULL_OBJECT;
}
MessageParcel data;
@@ -136,7 +136,7 @@ int32_t DistributedAbilityManagerProxy::UpdateConnectStatus(int32_t token, const
HILOGD("called.");
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOGE("remote is null");
HILOGE("UpdateConnectStatus remote is null");
return ERR_NULL_OBJECT;
}
MessageParcel data;
@@ -156,7 +156,7 @@ int32_t DistributedAbilityManagerProxy::StartDeviceManager(
HILOGD("called.");
sptr<IRemoteObject> remote = Remote();
if (remote == nullptr) {
HILOGE("remote is null");
HILOGE("StartDeviceManager remote is null");
return ERR_NULL_OBJECT;
}
MessageParcel data;
services/dtbabilitymgr/src/distributed_ability_manager_service.cpp
+31 -28
View File
@@ -90,35 +90,8 @@ bool DistributedAbilityManagerService::InitDmsImplFunc()
HILOGE("dlopen libdistributedschedsvr failed with errno:%s!", dlerror());
return false;
}
onRemoteRequestFunc_ = reinterpret_cast<OnRemoteRequestFunc>(dlsym(dmsImplHandle_, "OnRemoteRequest"));
if (onRemoteRequestFunc_ == nullptr) {
if (!InitFunc()) {
dlclose(dmsImplHandle_);
HILOGE("get OnRemoteRequest function error");
return false;
}
deviceOnlineNotifyFunc_ = reinterpret_cast<DeviceOnlineNotifyFunc>(dlsym(dmsImplHandle_, "DeviceOnlineNotify"));
if (deviceOnlineNotifyFunc_ == nullptr) {
dlclose(dmsImplHandle_);
HILOGE("get DeviceOnlineNotify function error");
return false;
}
deviceOfflineNotifyFunc_ = reinterpret_cast<DeviceOfflineNotifyFunc>(dlsym(dmsImplHandle_, "DeviceOfflineNotify"));
if (deviceOfflineNotifyFunc_ == nullptr) {
dlclose(dmsImplHandle_);
HILOGE("get DeviceOfflineNotify function error");
return false;
}
connectAbilityFunc_ = reinterpret_cast<ConnectAbilityFunc>(dlsym(dmsImplHandle_, "ConnectAbility"));
if (connectAbilityFunc_ == nullptr) {
dlclose(dmsImplHandle_);
HILOGE("get ConnectAbility function error");
return false;
}
disconnectAbilityFunc_ = reinterpret_cast<DisconnectAbilityFunc>(dlsym(dmsImplHandle_, "DisconnectAbility"));
if (disconnectAbilityFunc_ == nullptr) {
dlclose(dmsImplHandle_);
HILOGE("get DisconnectAbility function error");
return false;
}
OnStartFunc onStartFunc = reinterpret_cast<OnStartFunc>(dlsym(dmsImplHandle_, "OnStart"));
@@ -133,6 +106,36 @@ bool DistributedAbilityManagerService::InitDmsImplFunc()
return true;
}
bool DistributedAbilityManagerService::InitFunc()
{
onRemoteRequestFunc_ = reinterpret_cast<OnRemoteRequestFunc>(dlsym(dmsImplHandle_, "OnRemoteRequest"));
if (onRemoteRequestFunc_ == nullptr) {
HILOGE("get OnRemoteRequest function error");
return false;
}
deviceOnlineNotifyFunc_ = reinterpret_cast<DeviceOnlineNotifyFunc>(dlsym(dmsImplHandle_, "DeviceOnlineNotify"));
if (deviceOnlineNotifyFunc_ == nullptr) {
HILOGE("get DeviceOnlineNotify function error");
return false;
}
deviceOfflineNotifyFunc_ = reinterpret_cast<DeviceOfflineNotifyFunc>(dlsym(dmsImplHandle_, "DeviceOfflineNotify"));
if (deviceOfflineNotifyFunc_ == nullptr) {
HILOGE("get DeviceOfflineNotify function error");
return false;
}
connectAbilityFunc_ = reinterpret_cast<ConnectAbilityFunc>(dlsym(dmsImplHandle_, "ConnectAbility"));
if (connectAbilityFunc_ == nullptr) {
HILOGE("get ConnectAbility function error");
return false;
}
disconnectAbilityFunc_ = reinterpret_cast<DisconnectAbilityFunc>(dlsym(dmsImplHandle_, "DisconnectAbility"));
if (disconnectAbilityFunc_ == nullptr) {
HILOGE("get DisconnectAbility function error");
return false;
}
return true;
}
int32_t DistributedAbilityManagerService::SendRequestToImpl(uint32_t code, MessageParcel& data,
MessageParcel& reply, MessageOption& option)
{