From 500117f5d477f37c64064bc578a6eb76c4310588 Mon Sep 17 00:00:00 2001
From: ma-shaoyin <mashaoyin1@huawei.com>
Date: Tue, 29 Oct 2024 15:20:27 +0800
Subject: [PATCH 1/2] Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>

 Changes to be committed:
---
 .../inputmethod_ability/src/input_method_panel.cpp   | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/frameworks/native/inputmethod_ability/src/input_method_panel.cpp b/frameworks/native/inputmethod_ability/src/input_method_panel.cpp
index 05cd085d..e889d8a3 100644
--- a/frameworks/native/inputmethod_ability/src/input_method_panel.cpp
+++ b/frameworks/native/inputmethod_ability/src/input_method_panel.cpp
@@ -77,13 +77,11 @@ int32_t InputMethodPanel::CreatePanel(const std::shared_ptr<AbilityRuntime::Cont
         return ErrorCode::ERROR_OPERATE_PANEL;
     }
     windowId_ = window_->GetWindowId();
-    IMSA_HILOGI("success, type/flag/windowId: %{public}d/%{public}d/%{public}u.", static_cast<int32_t>(panelType_),
-        static_cast<int32_t>(panelFlag_), windowId_);
-    if (panelInfo.panelType == SOFT_KEYBOARD) {
-        isScbEnable_ = Rosen::SceneBoardJudgement::IsSceneBoardEnabled();
-        if (isScbEnable_) {
-            RegisterKeyboardPanelInfoChangeListener();
-        }
+    isScbEnable_ = Rosen::SceneBoardJudgement::IsSceneBoardEnabled();
+    IMSA_HILOGI("success, type/flag/windowId/isScbEnable_: %{public}d/%{public}d/%{public}u/%{public}d.",
+        static_cast<int32_t>(panelType_), static_cast<int32_t>(panelFlag_), windowId_, isScbEnable_);
+    if (panelInfo.panelType == SOFT_KEYBOARD && isScbEnable_) {
+        RegisterKeyboardPanelInfoChangeListener();
     }
     return ErrorCode::NO_ERROR;
 }

From 28a0273521376b3d262a049e033db30bbba7cd99 Mon Sep 17 00:00:00 2001
From: ma-shaoyin <mashaoyin1@huawei.com>
Date: Tue, 29 Oct 2024 16:33:40 +0800
Subject: [PATCH 2/2] Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>

 Changes to be committed:

 Changes to be committed:
---
 .../native/inputmethod_ability/src/input_method_panel.cpp       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frameworks/native/inputmethod_ability/src/input_method_panel.cpp b/frameworks/native/inputmethod_ability/src/input_method_panel.cpp
index e889d8a3..c0684068 100644
--- a/frameworks/native/inputmethod_ability/src/input_method_panel.cpp
+++ b/frameworks/native/inputmethod_ability/src/input_method_panel.cpp
@@ -71,13 +71,13 @@ int32_t InputMethodPanel::CreatePanel(const std::shared_ptr<AbilityRuntime::Cont
         IMSA_HILOGE("create window failed: %{public}d!", wmError);
         return ErrorCode::ERROR_OPERATE_PANEL;
     }
+    isScbEnable_ = Rosen::SceneBoardJudgement::IsSceneBoardEnabled();
     if (SetPanelProperties() != ErrorCode::NO_ERROR) {
         wmError = window_->Destroy();
         IMSA_HILOGI("destroy window end, wmError is %{public}d.", wmError);
         return ErrorCode::ERROR_OPERATE_PANEL;
     }
     windowId_ = window_->GetWindowId();
-    isScbEnable_ = Rosen::SceneBoardJudgement::IsSceneBoardEnabled();
     IMSA_HILOGI("success, type/flag/windowId/isScbEnable_: %{public}d/%{public}d/%{public}u/%{public}d.",
         static_cast<int32_t>(panelType_), static_cast<int32_t>(panelFlag_), windowId_, isScbEnable_);
     if (panelInfo.panelType == SOFT_KEYBOARD && isScbEnable_) {