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 <h.jhun@samsung.com>

diff --git a/frame-broker/include/frame_context.h b/frame-broker/include/frame_context.h
index f73d6c41b94085b0b88172097aa5be4633c2c027..042b9ba77409e6a146f68ad0e4e75472654cf6f4 100644 (file)
--- 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 2920d2a909995617c5c14bc65d043ff2757d729e..ac1462fc6409c5a7a2b8ccdb5af55b7bf1b3d4cb 100644 (file)
--- 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;
                }
        }