From 5a660ade63ae4ce7d268c4c575399a4d392428f9 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 14 Apr 2020 08:28:55 +0900 Subject: [PATCH] Fix Frame Broker Frame Broker invokes the error callback directly when the error is delivered from Display Server before sending the launch request. Change-Id: I232b06532f70856903d8ea1ba6c2e222bf689a20 Signed-off-by: Hwankyu Jhun --- frame-broker/include/frame_context.h | 1 + frame-broker/src/frame_broker.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frame-broker/include/frame_context.h b/frame-broker/include/frame_context.h index f73d6c41..042b9ba7 100644 --- a/frame-broker/include/frame_context.h +++ b/frame-broker/include/frame_context.h @@ -102,6 +102,7 @@ typedef void (*frame_context_destroy_cb)(frame_context_h context, * @param[in] user_data The user data passed from frame_broker_create() function * * @see frame_context_error_e + * @remarks The context handle can be NULL pointer when the error is delivered from Display Server before sending the launch request. */ typedef void (*frame_context_error_cb)(frame_context_h context, frame_context_error_e error, diff --git a/frame-broker/src/frame_broker.c b/frame-broker/src/frame_broker.c index 2920d2a9..ac1462fc 100644 --- a/frame-broker/src/frame_broker.c +++ b/frame-broker/src/frame_broker.c @@ -244,7 +244,9 @@ static void __scls_error_cb(screen_connector_launcher_service_error_e error, __check_pre_context(broker); context = broker->context; } else { - _E("Invalid context"); + _W("Invoke error callback directly"); + broker->callback.error(NULL, __convert_error(error), + broker->user_data); return; } } -- 2.34.1