From 4516312974e14c93f5e2bf0ad8c20f48f2c03477 Mon Sep 17 00:00:00 2001 From: abc12133 Date: Wed, 28 Jun 2023 09:56:48 +0800 Subject: [PATCH] enable access to display_server in same process Signed-off-by: abc12133 --- .../fangtian/rs_render_service_connect_hub.cpp | 12 +++++++----- .../platform/ohos/rs_render_service_connect_hub.cpp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connect_hub.cpp b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connect_hub.cpp index 8451bf7..35363eb 100755 --- a/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connect_hub.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/fangtian/rs_render_service_connect_hub.cpp @@ -106,7 +106,7 @@ bool RSRenderServiceConnectHub::Connect() continue; } auto remoteObject = samgr->GetSystemAbility(RENDER_SERVICE); - if (remoteObject == nullptr || !remoteObject->IsProxyObject()) { + if (remoteObject == nullptr) { continue; } renderService = iface_cast(remoteObject); @@ -120,9 +120,11 @@ bool RSRenderServiceConnectHub::Connect() return false; } - deathRecipient_ = new RenderServiceDeathRecipient(this); - if (!renderService->AsObject()->AddDeathRecipient(deathRecipient_)) { - ROSEN_LOGW("RSRenderServiceConnectHub::Connect, failed to AddDeathRecipient of render service."); + if (renderService->AsObject()->IsProxyObject()) { + deathRecipient_ = new RenderServiceDeathRecipient(this); + if (!renderService->AsObject()->AddDeathRecipient(deathRecipient_)) { + ROSEN_LOGW("RSRenderServiceConnectHub::Connect, failed to AddDeathRecipient of render service."); + } } if (token_ == nullptr) { @@ -139,7 +141,7 @@ bool RSRenderServiceConnectHub::Connect() std::lock_guard lock(mutex_); renderService_ = renderService; conn_ = conn; - + if (onConnectCallback_) { onConnectCallback_(conn_); } diff --git a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connect_hub.cpp b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connect_hub.cpp index 9a2a3f1..bae9e96 100755 --- a/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connect_hub.cpp +++ b/display_server/rosen/modules/render_service_base/src/platform/ohos/rs_render_service_connect_hub.cpp @@ -139,7 +139,7 @@ bool RSRenderServiceConnectHub::Connect() std::lock_guard lock(mutex_); renderService_ = renderService; conn_ = conn; - + if (onConnectCallback_) { onConnectCallback_(conn_); } -- Gitee