fix proxy

Signed-off-by: qpzeng <zengqingpeng6@huawei.com>
Change-Id: I1e6e351a5a4bf041ff306c166c5c5cb116db87de

dm/BUILD.gn

@@ -19,6 +19,8 @@ config("libdm_private_config") {
     "include",
     "../dmserver/include",
     "${window_base_path}/interfaces/innerkits/wm",
+    "${window_base_path}/window_scene",
+    "${window_base_path}/window_scene/screen_session_manager/include",
     "${window_base_path}/window_scene/session_manager/include",
     "${window_base_path}/window_scene/session_manager_service/include",
     "${window_base_path}/window_scene/interfaces/innerkits/include",
@@ -43,6 +45,7 @@ ohos_static_library("libdm_static") {
   }
   sources = [
     "../dmserver/src/display_manager_proxy.cpp",
+    "../window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp",
     "src/display.cpp",
     "src/display_manager.cpp",
     "src/display_manager_adapter.cpp",
@@ -62,7 +65,6 @@ ohos_static_library("libdm_static") {
   deps = [
     "${window_base_path}/utils:libwmutil",
     "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
-    "${window_base_path}/window_scene/session_manager:session_manager",
   ]
 
   external_deps = [
@@ -89,6 +91,7 @@ ohos_shared_library("libdm") {
   }
   sources = [
     "../dmserver/src/display_manager_proxy.cpp",
+    "../window_scene/session_manager/src/zidl/screen_session_manager_proxy.cpp",
     "src/display.cpp",
     "src/display_manager.cpp",
     "src/display_manager_adapter.cpp",
@@ -105,7 +108,10 @@ ohos_shared_library("libdm") {
 
   public_configs = [ ":libdm_public_config" ]
 
-  deps = [ "../utils:libwmutil" ]
+  deps = [
+    "${window_base_path}/utils:libwmutil",
+    "${window_base_path}/window_scene/interfaces/innerkits:libwsutils",
+  ]
 
   external_deps = [
     "ability_runtime:ability_manager",

dm/src/display_manager_adapter.cpp

@@ -20,8 +20,10 @@
 #include <system_ability_definition.h>
 
 #include "display_manager.h"
+#include "scene_board_judgement.h"
 #include "screen_manager.h"
 #include "window_manager_hilog.h"
+#include "zidl/screen_session_manager_interface.h"
 
 namespace OHOS::Rosen {
 namespace {
@@ -357,7 +359,11 @@ bool BaseAdapter::InitDMSProxy()
             return false;
         }
 
+        if (SceneBoardJudgement::IsSceneBoardEnabled()) {
+            displayManagerServiceProxy_ = iface_cast<IScreenSessionManager>(remoteObject);
+        } else {
             displayManagerServiceProxy_ = iface_cast<IDisplayManager>(remoteObject);
+        }
         if ((!displayManagerServiceProxy_) || (!displayManagerServiceProxy_->AsObject())) {
             WLOGFE("Failed to get system display manager services");
             return false;

sa_profile/BUILD.gn

@@ -12,10 +12,7 @@
 # limitations under the License.
 
 import("//build/ohos/sa_profile/sa_profile.gni")
-
+import("../windowmanager_aafwk.gni")
-declare_args() {
-  scene_board_enabled = false
-}
 
 ohos_sa_profile("wms_sa_profile") {
   sources = [ "4606.json" ]

test/fuzztest/window_scene/screensessionmanager_fuzzer/BUILD.gn

@@ -35,6 +35,7 @@ ohos_fuzztest("ScreenSessionManagerFuzzTest") {
   ]
   sources = [ "screensessionmanager_fuzzer.cpp" ]
   deps = [
+    "${window_base_path}/dm:libdm",
     "${window_base_path}/utils:libwmutil",
     "${window_base_path}/window_scene/common:window_scene_common",
     "${window_base_path}/window_scene/session_manager:session_manager",

window_scene/session/screen/src/screen_session.cpp

@@ -67,6 +67,7 @@ void ScreenSession::SetDisplayNodeScreenId(ScreenId screenId)
     if (displayNode_ != nullptr) {
         WLOGFI("SetDisplayNodeScreenId %{public}" PRIu64"", screenId);
         displayNode_->SetScreenId(screenId);
+        RSTransaction::FlushImplicitTransaction();
     }
 }
 

window_scene/session_manager/BUILD.gn

@@ -257,7 +257,6 @@ ohos_shared_library("session_manager") {
     "../session_manager_service/src/session_manager_service_proxy.cpp",
     "src/session_manager.cpp",
     "src/zidl/scene_session_manager_proxy.cpp",
-    "src/zidl/screen_session_manager_proxy.cpp",
   ]
 
   cflags_cc = [ "-std=c++17" ]

window_scene/session_manager/include/zidl/screen_session_manager_interface.h

@@ -29,6 +29,8 @@ class RRectT;
 
 class IScreenSessionManager : public IDisplayManager {
 public:
+    DECLARE_INTERFACE_DESCRIPTOR(u"OHOS.IScreenSessionManager");
+
     virtual sptr<DisplayInfo> GetDefaultDisplayInfo() override { return nullptr; }
     virtual sptr<DisplayInfo> GetDisplayInfoById(DisplayId displayId) override { return nullptr; }
     virtual sptr<DisplayInfo> GetDisplayInfoByScreen(ScreenId screenId) override {return nullptr; }

windowmanager_aafwk.gni

@@ -29,6 +29,7 @@ sensor_path = "//base/sensors/sensor"
 accessibility_path = "//foundation/barrierfree/accessibility"
 
 declare_args() {
+  scene_board_enabled = false
   efficiency_manager_enable = true
   window_manager_feature_subscribe_motion = false
   window_manager_feature_tp_enable = false
@@ -39,5 +40,6 @@ declare_args() {
   }
 }
 
+print("scene_board_enabled = ${scene_board_enabled}")
 print(
     "window_manager_feature_subscribe_motion = ${window_manager_feature_subscribe_motion}")