openharmony/advertising_oaid
1
0
Fork 0
mirror of https://gitee.com/openharmony/advertising_oaid synced 2025-02-12 11:18:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!57 cfi整改

Browse Source 
Merge pull request !57 from zjl0222/master-1
This commit is contained in:
openharmony_ci 2024-07-26 12:16:04 +00:00 committed by Gitee
commit 2fdca16d86
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/oaid_manager/include/oaid_service_stub.h
View File

@ -44,14 +44,12 @@ public:
int32_t OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParcel& reply, MessageOption& option) override;
private:
using OAIDServiceFunc = int32_t (OAIDServiceStub::*)(MessageParcel& data, MessageParcel& reply);
int32_t OnGetOAID(MessageParcel& data, MessageParcel& reply);
int32_t OnResetOAID(MessageParcel& data, MessageParcel& reply);
bool CheckPermission(const std::string &permissionName);
bool CheckSystemApp();
std::map<uint32_t, OAIDServiceFunc> memberFuncMap_;
};
} // namespace Cloud
} // namespace OHOS

22
services/oaid_manager/src/oaid_service_stub.cpp
View File

@ -26,7 +26,6 @@
#include "oaid_service_ipc_interface_code.h"
#include "config_policy_utils.h"
using namespace OHOS::Security::AccessToken;
namespace OHOS {
@ -34,13 +33,10 @@ namespace Cloud {
using namespace OHOS::HiviewDFX;
OAIDServiceStub::OAIDServiceStub()
{
memberFuncMap_[static_cast<uint32_t>(OAIDInterfaceCode::GET_OAID)] = &OAIDServiceStub::OnGetOAID;
memberFuncMap_[static_cast<uint32_t>(OAIDInterfaceCode::RESET_OAID)] = &OAIDServiceStub::OnResetOAID;
}
OAIDServiceStub::~OAIDServiceStub()
{
memberFuncMap_.clear();
}
bool OAIDServiceStub::CheckPermission(const std::string &permissionName)
@ -182,17 +178,17 @@ int32_t OAIDServiceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Mes
}
OAID_HILOGI(OAID_MODULE_SERVICE, "Remote bundleName is %{public}s.", bundleName.c_str());
auto itFunc = memberFuncMap_.find(code);
if (itFunc != memberFuncMap_.end()) {
auto memberFunc = itFunc->second;
if (memberFunc != nullptr) {
return (this->*memberFunc)(data, reply);
switch (code) {
case static_cast<uint32_t>(OAIDInterfaceCode::GET_OAID):{
return OAIDServiceStub::OnGetOAID(data, reply);
break;
}
case static_cast<uint32_t>(OAIDInterfaceCode::RESET_OAID):{
return OAIDServiceStub::OnResetOAID(data, reply);
break;
}
}
int32_t ret = IPCObjectStub::OnRemoteRequest(code, data, reply, option);
OAID_HILOGE(OAID_MODULE_SERVICE, "No find process to handle, ret is %{public}d.", ret);
return ret;
return ERR_SYSYTEM_ERROR;
}
int32_t OAIDServiceStub::OnGetOAID(MessageParcel &data, MessageParcel &reply)