From 8fd7f17b99e1a9ee4f9a72a76e8385f2834d2cc3 Mon Sep 17 00:00:00 2001 From: fangyun Date: Mon, 21 Nov 2022 10:42:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B6=88=E9=99=A4llvm=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fangyun --- services/edm/src/enterprise_device_mgr_ability.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/services/edm/src/enterprise_device_mgr_ability.cpp b/services/edm/src/enterprise_device_mgr_ability.cpp index 404a7e7ed..f49c5967c 100644 --- a/services/edm/src/enterprise_device_mgr_ability.cpp +++ b/services/edm/src/enterprise_device_mgr_ability.cpp @@ -765,11 +765,10 @@ ErrCode EnterpriseDeviceMgrAbility::HandleManagedEvent(const AppExecFwk::Element if (iter != std::end(events)) { return EdmReturnErrCode::MANAGED_EVENTS_INVALID; } - ErrCode code; if (subscribe) { - code = adminMgr_->SaveSubscribeEvents(events, adminItem, userId); + adminMgr_->SaveSubscribeEvents(events, adminItem, userId); } else { - code = adminMgr_->RemoveSubscribeEvents(events, adminItem, userId); + adminMgr_->RemoveSubscribeEvents(events, adminItem, userId); } return ERR_OK; } -- Gitee From 08f548307ea5ea6238d3ab4e3ea4dbb5a4d347c8 Mon Sep 17 00:00:00 2001 From: fangyun Date: Mon, 21 Nov 2022 10:42:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B6=88=E9=99=A4llvm=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: fangyun --- services/edm/include/admin_manager.h | 4 ++-- services/edm/src/admin_manager.cpp | 6 ++---- test/unittest/src/admin_manager_test.cpp | 16 ++++++++-------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/services/edm/include/admin_manager.h b/services/edm/include/admin_manager.h index 56a7aa178..11e82f03e 100644 --- a/services/edm/include/admin_manager.h +++ b/services/edm/include/admin_manager.h @@ -49,8 +49,8 @@ public: std::vector &permissions, int32_t userId); ErrCode GetEntInfo(const std::string &packageName, EntInfo &entInfo, int32_t userId); ErrCode SetEntInfo(const std::string &packageName, EntInfo &entInfo, int32_t userId); - ErrCode SaveSubscribeEvents(const std::vector &events, std::shared_ptr &admin, int32_t userId); - ErrCode RemoveSubscribeEvents(const std::vector &events, std::shared_ptr &admin, int32_t userId); + void SaveSubscribeEvents(const std::vector &events, std::shared_ptr &admin, int32_t userId); + void RemoveSubscribeEvents(const std::vector &events, std::shared_ptr &admin, int32_t userId); virtual ~AdminManager(); private: diff --git a/services/edm/src/admin_manager.cpp b/services/edm/src/admin_manager.cpp index 173ff6679..66d5ec805 100644 --- a/services/edm/src/admin_manager.cpp +++ b/services/edm/src/admin_manager.cpp @@ -314,7 +314,7 @@ ErrCode AdminManager::SetEntInfo(const std::string &packageName, EntInfo &entInf return ERR_EDM_UNKNOWN_ADMIN; } -ErrCode AdminManager::SaveSubscribeEvents(const std::vector &events, +void AdminManager::SaveSubscribeEvents(const std::vector &events, std::shared_ptr &admin, int32_t userId) { size_t eventsNumber = admin->adminInfo_.managedEvents_.size(); @@ -328,10 +328,9 @@ ErrCode AdminManager::SaveSubscribeEvents(const std::vector &events, if (admin->adminInfo_.managedEvents_.size() > eventsNumber) { SaveAdmin(userId); } - return ERR_OK; } -ErrCode AdminManager::RemoveSubscribeEvents(const std::vector &events, +void AdminManager::RemoveSubscribeEvents(const std::vector &events, std::shared_ptr &admin, int32_t userId) { size_t eventsNumber = admin->adminInfo_.managedEvents_.size(); @@ -348,7 +347,6 @@ ErrCode AdminManager::RemoveSubscribeEvents(const std::vector &events, if (admin->adminInfo_.managedEvents_.size() < eventsNumber) { SaveAdmin(userId); } - return ERR_OK; } // init void AdminManager::Init() diff --git a/test/unittest/src/admin_manager_test.cpp b/test/unittest/src/admin_manager_test.cpp index 98ea4431e..52ef1a9fd 100644 --- a/test/unittest/src/admin_manager_test.cpp +++ b/test/unittest/src/admin_manager_test.cpp @@ -467,11 +467,11 @@ HWTEST_F(AdminManagerTest, TestSaveSubscribeEvents, TestSize.Level1) entInfo.description = "technology company in wuhan"; std::vector permissions = { "ohos.permission.EDM_TEST_PERMISSION" }; adminMgr_->SetAdminValue(abilityInfo, entInfo, AdminType::NORMAL, permissions, DEFAULT_USER_ID); - ErrCode ret = adminMgr_->SaveSubscribeEvents(events, admin, DEFAULT_USER_ID); - ASSERT_TRUE(ret == ERR_OK); + adminMgr_->SaveSubscribeEvents(events, admin, DEFAULT_USER_ID); + ASSERT_TRUE(admin->adminInfo_.managedEvents_.size() == 1); events.push_back(1); - ret = adminMgr_->SaveSubscribeEvents(events, admin, DEFAULT_USER_ID); - ASSERT_TRUE(ret == ERR_OK); + adminMgr_->SaveSubscribeEvents(events, admin, DEFAULT_USER_ID); + ASSERT_TRUE(admin->adminInfo_.managedEvents_.size() > 1); } /** @@ -492,11 +492,11 @@ HWTEST_F(AdminManagerTest, TestRemoveSubscribeEvents, TestSize.Level1) entInfo.description = "technology company in wuhan"; std::vector permissions = { "ohos.permission.EDM_TEST_PERMISSION" }; adminMgr_->SetAdminValue(abilityInfo, entInfo, AdminType::NORMAL, permissions, DEFAULT_USER_ID); - ErrCode ret = adminMgr_->RemoveSubscribeEvents(events, admin, DEFAULT_USER_ID); - ASSERT_TRUE(ret == ERR_OK); + adminMgr_->RemoveSubscribeEvents(events, admin, DEFAULT_USER_ID); + ASSERT_TRUE(admin->adminInfo_.managedEvents_.size() == 1); events.push_back(0); - ret = adminMgr_->RemoveSubscribeEvents(events, admin, DEFAULT_USER_ID); - ASSERT_TRUE(ret == ERR_OK); + adminMgr_->RemoveSubscribeEvents(events, admin, DEFAULT_USER_ID); + ASSERT_TRUE(admin->adminInfo_.managedEvents_.empty()); } } // namespace TEST } // namespace EDM -- Gitee