From b2d1a54c8a31c3f404ec02a0292f3f6198da58e9 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Mon, 20 Nov 2023 09:45:27 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=B8=82=E5=9C=BA=E7=9A=84=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: If1df132635984af98ee3a911959c756f1f69cd29 --- .../app_gallery_service_connection.h | 2 +- services/backup_sa/include/module_ipc/service.h | 8 ++++++++ services/backup_sa/src/module_ipc/service.cpp | 15 ++++++++++----- .../src/module_sched/sched_scheduler.cpp | 3 +++ tests/mock/module_ipc/service_mock.cpp | 2 ++ 5 files changed, 24 insertions(+), 6 deletions(-) diff --git a/services/backup_sa/include/module_app_gallery/app_gallery_service_connection.h b/services/backup_sa/include/module_app_gallery/app_gallery_service_connection.h index d653a8e53..21a710a0e 100644 --- a/services/backup_sa/include/module_app_gallery/app_gallery_service_connection.h +++ b/services/backup_sa/include/module_app_gallery/app_gallery_service_connection.h @@ -30,7 +30,7 @@ namespace OHOS::FileManagement::Backup { using namespace OHOS::AppExecFwk; -const int32_t CONNECT_TIME = 5; +const int32_t CONNECT_TIME = 3; template class AppGralleryConnection : public AbilityConnectionStub { public: diff --git a/services/backup_sa/include/module_ipc/service.h b/services/backup_sa/include/module_ipc/service.h index b45d1ae6e..aefde85e1 100644 --- a/services/backup_sa/include/module_ipc/service.h +++ b/services/backup_sa/include/module_ipc/service.h @@ -90,6 +90,14 @@ public: */ virtual void ExtStart(const std::string &bundleName); + /** + * @brief 发送备份恢复通知到应用市场 + * + * @param bundleName 应用名称 + * + */ + void SendAppGalleryNotify(const std::string &bundleName); + public: explicit Service(int32_t saID, bool runOnCreate = false) : SystemAbility(saID, runOnCreate) { diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index d33611279..89d2aee73 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -462,11 +462,6 @@ ErrCode Service::LaunchBackupExtension(const BundleName &bundleName) { try { HILOGE("begin %{public}s", bundleName.data()); - - DisposeErr disposeErr = AppGalleryDisposeProxy::GetInstance()->StartRestore(bundleName); - HILOGI("AppGalleryDisposeProxy StartRestore, code=%{public}d, bundleName=%{public}s", disposeErr, - bundleName.c_str()); - IServiceReverse::Scenario scenario = session_->GetScenario(); BConstants::ExtensionAction action; if (scenario == IServiceReverse::Scenario::BACKUP) { @@ -783,4 +778,14 @@ void Service::OnStartSched() } } } + +void Service::SendAppGalleryNotify(const BundleName &bundleName) +{ + IServiceReverse::Scenario scenario = session_->GetScenario(); + if (scenario == IServiceReverse::Scenario::RESTORE) { + DisposeErr disposeErr = AppGalleryDisposeProxy::GetInstance()->StartRestore(bundleName); + HILOGI("AppGalleryDisposeProxy StartRestore, code=%{public}d, bundleName=%{public}s", disposeErr, + bundleName.c_str()); + } +} } // namespace OHOS::FileManagement::Backup diff --git a/services/backup_sa/src/module_sched/sched_scheduler.cpp b/services/backup_sa/src/module_sched/sched_scheduler.cpp index 696d3539e..f7c009d7c 100644 --- a/services/backup_sa/src/module_sched/sched_scheduler.cpp +++ b/services/backup_sa/src/module_sched/sched_scheduler.cpp @@ -72,6 +72,9 @@ void SchedScheduler::ExecutingQueueTasks(const string &bundleName) InstallingState(bundleName); BConstants::ServiceSchedAction action = sessionPtr_->GetServiceSchedAction(bundleName); if (action == BConstants::ServiceSchedAction::START) { + // 通知应用市场 + reversePtr_->SendAppGalleryNotify(bundleName); + // 注册启动定时器 auto callStart = [reversePtr {reversePtr_}, bundleName]() { HILOGE("Extension connect failed = %{public}s", bundleName.data()); diff --git a/tests/mock/module_ipc/service_mock.cpp b/tests/mock/module_ipc/service_mock.cpp index a4e6dc931..11aa99bd9 100644 --- a/tests/mock/module_ipc/service_mock.cpp +++ b/tests/mock/module_ipc/service_mock.cpp @@ -125,4 +125,6 @@ void Service::VerifyCaller(IServiceReverse::Scenario scenario) {} void Service::OnAllBundlesFinished(ErrCode errCode) {} void Service::OnStartSched() {} + +void Service::sendAppGalleryNotify(const BundleName &bundleName) {} } // namespace OHOS::FileManagement::Backup -- Gitee From 80b53c73f5a7adb3a66552b947f4da8f8cf3a258 Mon Sep 17 00:00:00 2001 From: z30054037 Date: Tue, 21 Nov 2023 08:11:02 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=B8=82=E5=9C=BA=E7=9A=84=E6=97=B6=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: z30054037 Change-Id: Ifc3b122f8a5099b393f4e72e0dcfee2c6db41d6a --- tests/mock/module_ipc/service_mock.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mock/module_ipc/service_mock.cpp b/tests/mock/module_ipc/service_mock.cpp index 11aa99bd9..6c69ba3e7 100644 --- a/tests/mock/module_ipc/service_mock.cpp +++ b/tests/mock/module_ipc/service_mock.cpp @@ -126,5 +126,5 @@ void Service::OnAllBundlesFinished(ErrCode errCode) {} void Service::OnStartSched() {} -void Service::sendAppGalleryNotify(const BundleName &bundleName) {} +void Service::SendAppGalleryNotify(const BundleName &bundleName) {} } // namespace OHOS::FileManagement::Backup -- Gitee