From ef9be7ebcb6d529d1a8c0582e61b7c9925c78912 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Wed, 2 Mar 2022 12:03:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?OpenHarmonySA=E4=B8=AD=E7=BB=A7=E6=94=BB?= =?UTF-8?q?=E5=87=BB=E9=97=AE=E9=A2=98=E6=8E=92=E6=9F=A5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=20Signed-off-by:=20zuojiangjiang=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../include/ikvstore_client_death_observer.h | 3 +-- .../src/ikvstore_client_death_observer.cpp | 5 ----- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h index 15a83f10d..ee6d91a4a 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h +++ b/frameworks/innerkitsimpl/distributeddatafwk/include/ikvstore_client_death_observer.h @@ -30,8 +30,7 @@ public: class KvStoreClientDeathObserverStub : public IRemoteStub { public: - virtual int OnRemoteRequest(uint32_t code, MessageParcel &data, - MessageParcel &reply, MessageOption &option) override; + }; class KvStoreClientDeathObserverProxy : public IRemoteProxy { diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_client_death_observer.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_client_death_observer.cpp index 4299647b2..32fcfae8a 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_client_death_observer.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_client_death_observer.cpp @@ -21,10 +21,5 @@ KvStoreClientDeathObserverProxy::KvStoreClientDeathObserverProxy(const sptr(impl) {} -int32_t KvStoreClientDeathObserverStub::OnRemoteRequest(uint32_t code, MessageParcel &data, - MessageParcel &reply, MessageOption &option) -{ - return IPCObjectStub::OnRemoteRequest(code, data, reply, option); -} } // namespace DistributedKv } // namespace OHOS -- Gitee From 449ec04c0d5963fb0707b35a82912694b7aeb534 Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Wed, 2 Mar 2022 14:01:09 +0800 Subject: [PATCH 2/3] delete the blank row Signed-off-by: zuojiangjiang --- .../distributeddatafwk/src/ikvstore_client_death_observer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_client_death_observer.cpp b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_client_death_observer.cpp index 32fcfae8a..2c6616444 100644 --- a/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_client_death_observer.cpp +++ b/frameworks/innerkitsimpl/distributeddatafwk/src/ikvstore_client_death_observer.cpp @@ -20,6 +20,5 @@ namespace DistributedKv { KvStoreClientDeathObserverProxy::KvStoreClientDeathObserverProxy(const sptr &impl) : IRemoteProxy(impl) {} - } // namespace DistributedKv } // namespace OHOS -- Gitee From 137ee4e30df170de9c7c800700a3bd3e0f63f27b Mon Sep 17 00:00:00 2001 From: zuojiangjiang Date: Wed, 2 Mar 2022 21:27:27 +0800 Subject: [PATCH 3/3] modify appid to apptmp in AppExit Signed-off-by: zuojiangjiang --- .../distributeddataservice/app/src/kvstore_data_service.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/distributeddataservice/app/src/kvstore_data_service.cpp b/services/distributeddataservice/app/src/kvstore_data_service.cpp index 57ec67c97..7733dfee8 100644 --- a/services/distributeddataservice/app/src/kvstore_data_service.cpp +++ b/services/distributeddataservice/app/src/kvstore_data_service.cpp @@ -737,9 +737,9 @@ Status KvStoreDataService::AppExit(const AppId &appId, pid_t uid) ZLOGI("map size: %zu.", clientDeathObserverMap_.size()); } - std::string trueAppId = CheckerManager::GetInstance().GetAppId(appId.appId, uid); + std::string trueAppId = CheckerManager::GetInstance().GetAppId(appIdTmp.appId, uid); if (trueAppId.empty()) { - ZLOGW("check appId:%{public}s uid:%{public}d failed.", appId.appId.c_str(), uid); + ZLOGW("check appId:%{public}s uid:%{public}d failed.", appIdTmp.appId.c_str(), uid); return Status::PERMISSION_DENIED; } const std::string userId = AccountDelegate::GetInstance()->GetCurrentAccountId(appIdTmp.appId); -- Gitee