From d90b05c826067e0589e7cb83a34ea98f8ef6d1be Mon Sep 17 00:00:00 2001 From: mingxihua Date: Wed, 19 Jan 2022 07:22:15 +0000 Subject: [PATCH 1/3] IssueNo:#I4PCM1:ce/de context Description: ce/de context Sig:SIG_ApplicationFramework Feature or Bugfix:Feature Binary Source:No Signed-off-by: mingxihua --- .../ability_runtime/include/ability_context_impl.h | 1 + .../ability/ability_runtime/src/ability_context_impl.cpp | 8 ++++++++ .../kits/napi/aafwk/ability_context/ability_context.js | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/frameworks/kits/ability/ability_runtime/include/ability_context_impl.h b/frameworks/kits/ability/ability_runtime/include/ability_context_impl.h index 1a12d57bbf0..0a6e5a94540 100755 --- a/frameworks/kits/ability/ability_runtime/include/ability_context_impl.h +++ b/frameworks/kits/ability/ability_runtime/include/ability_context_impl.h @@ -34,6 +34,7 @@ public: std::string GetDatabaseDir() override; std::string GetStorageDir() override; std::string GetDistributedFilesDir() override; + void SwitchArea(int mode) override; std::string GetBundleName() const override; std::shared_ptr GetApplicationInfo() const override; std::shared_ptr GetResourceManager() const override; diff --git a/frameworks/kits/ability/ability_runtime/src/ability_context_impl.cpp b/frameworks/kits/ability/ability_runtime/src/ability_context_impl.cpp index e31aa1de2fe..8ac0aef46b8 100755 --- a/frameworks/kits/ability/ability_runtime/src/ability_context_impl.cpp +++ b/frameworks/kits/ability/ability_runtime/src/ability_context_impl.cpp @@ -59,6 +59,14 @@ std::string AbilityContextImpl::GetDistributedFilesDir() return stageContext_ ? stageContext_->GetDistributedFilesDir() : ""; } +void AbilityContextImpl::SwitchArea(int mode) +{ + HILOG_DEBUG("AbilityContextImpl::SwitchArea."); + if (stageContext_ != nullptr) { + stageContext_->SwitchArea(mode); + } +} + ErrCode AbilityContextImpl::StartAbility(const AAFwk::Want &want, int requestCode) { BYTRACE_NAME(BYTRACE_TAG_ABILITY_MANAGER, __PRETTY_FUNCTION__); diff --git a/interfaces/kits/napi/aafwk/ability_context/ability_context.js b/interfaces/kits/napi/aafwk/ability_context/ability_context.js index 98e7334cd04..e52924bd323 100755 --- a/interfaces/kits/napi/aafwk/ability_context/ability_context.js +++ b/interfaces/kits/napi/aafwk/ability_context/ability_context.js @@ -53,6 +53,10 @@ class AbilityContext extends Context { restoreWindowStage(contentStorage) { return this.__context_impl__.restoreWindowStage(contentStorage) } + + SwitchArea(mode) { + return this.__context_impl__.SwitchArea(mode) + } } export default AbilityContext -- Gitee From c5638546e02885df68b3f8055490eb995b277729 Mon Sep 17 00:00:00 2001 From: mingxihua Date: Wed, 19 Jan 2022 07:35:32 +0000 Subject: [PATCH 2/3] IssueNo:#I4PCM1:ce/de context Description: ce/de context Sig:SIG_ApplicationFramework Feature or Bugfix:Feature Binary Source:No Signed-off-by: mingxihua --- interfaces/kits/napi/aafwk/ability_context/ability_context.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interfaces/kits/napi/aafwk/ability_context/ability_context.js b/interfaces/kits/napi/aafwk/ability_context/ability_context.js index e52924bd323..c945ab9dfc9 100755 --- a/interfaces/kits/napi/aafwk/ability_context/ability_context.js +++ b/interfaces/kits/napi/aafwk/ability_context/ability_context.js @@ -54,8 +54,8 @@ class AbilityContext extends Context { return this.__context_impl__.restoreWindowStage(contentStorage) } - SwitchArea(mode) { - return this.__context_impl__.SwitchArea(mode) + switchArea(mode) { + return this.__context_impl__.switchArea(mode) } } -- Gitee From 3c246da382059bfbf1a3ed0c8b4910b7ed40bff9 Mon Sep 17 00:00:00 2001 From: mingxihua Date: Thu, 20 Jan 2022 05:03:11 +0000 Subject: [PATCH 3/3] TicketNo: AR000GJUNG Description: service leak detection. Team: OTHERS Feature or Bugfix: Feature Binary Source: No PrivateCode(Yes/No):No --- interfaces/kits/napi/aafwk/ability_context/ability_context.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/interfaces/kits/napi/aafwk/ability_context/ability_context.js b/interfaces/kits/napi/aafwk/ability_context/ability_context.js index c945ab9dfc9..98e7334cd04 100755 --- a/interfaces/kits/napi/aafwk/ability_context/ability_context.js +++ b/interfaces/kits/napi/aafwk/ability_context/ability_context.js @@ -53,10 +53,6 @@ class AbilityContext extends Context { restoreWindowStage(contentStorage) { return this.__context_impl__.restoreWindowStage(contentStorage) } - - switchArea(mode) { - return this.__context_impl__.switchArea(mode) - } } export default AbilityContext -- Gitee