- In case of sending WIDGET_INSTANCE_EVENT_CREATE_ABORTED, the error
code should be sent to viewer
- Require:
https://review.tizen.org/gerrit/#/c/149321/
Change-Id: I2ad991dda2e4e10d78a774f75a42fefa90bc99d2
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>
Signed-off-by: Hyunho Kang <hhstark.kang@samsung.com>
}
static int __send_update_status(const char *class_id, const char *instance_id,
}
static int __send_update_status(const char *class_id, const char *instance_id,
- int status, bundle *extra)
+ int status, int err, bundle *extra)
{
bundle *b;
int lifecycle = -1;
bundle_raw *raw = NULL;
int len;
{
bundle *b;
int lifecycle = -1;
bundle_raw *raw = NULL;
int len;
b = bundle_create();
if (!b) {
b = bundle_create();
if (!b) {
return -1; /* LCOV_EXCL_LINE */
}
return -1; /* LCOV_EXCL_LINE */
}
+ if (err < 0) {
+ snprintf(err_str, sizeof(err_str), "%d", err);
+ bundle_add_str(b, AUL_K_WIDGET_ERROR_CODE, err_str);
+ }
+
bundle_add_str(b, AUL_K_WIDGET_ID, class_id);
bundle_add_str(b, AUL_K_WIDGET_INSTANCE_ID, instance_id);
bundle_add_byte(b, AUL_K_WIDGET_STATUS, &status, sizeof(int));
bundle_add_str(b, AUL_K_WIDGET_ID, class_id);
bundle_add_str(b, AUL_K_WIDGET_INSTANCE_ID, instance_id);
bundle_add_byte(b, AUL_K_WIDGET_STATUS, &status, sizeof(int));
LOGD("%s is resized to %dx%d", id, w, h);
__send_update_status(class_id, id,
LOGD("%s is resized to %dx%d", id, w, h);
__send_update_status(class_id, id,
- WIDGET_INSTANCE_EVENT_SIZE_CHANGED, NULL);
+ WIDGET_INSTANCE_EVENT_SIZE_CHANGED, 0, NULL);
}
static void __call_update_cb(const char *class_id, const char *id, int force,
}
static void __call_update_cb(const char *class_id, const char *id, int force,
cls->ops.update(instance_h, content, force, class_data);
__send_update_status(class_id, id,
cls->ops.update(instance_h, content, force, class_data);
__send_update_status(class_id, id,
- WIDGET_INSTANCE_EVENT_UPDATE, NULL);
+ WIDGET_INSTANCE_EVENT_UPDATE, 0, NULL);
LOGD("updated:%s", id);
if (content)
LOGD("updated:%s", id);
if (content)
return WIDGET_BASE_ERROR_FAULT;
ret = __send_update_status(class_id, id,
return WIDGET_BASE_ERROR_FAULT;
ret = __send_update_status(class_id, id,
- WIDGET_INSTANCE_EVENT_EXTRA_UPDATED, content_info);
+ WIDGET_INSTANCE_EVENT_EXTRA_UPDATED, 0, content_info);
if (data->content)
free(data->content);
if (data->content)
free(data->content);
if (ret < 0) {
LOGW("Create callback returns error(%d)", ret);
ret = __send_update_status(class_id, id,
if (ret < 0) {
LOGW("Create callback returns error(%d)", ret);
ret = __send_update_status(class_id, id,
- WIDGET_INSTANCE_EVENT_CREATE_ABORTED, NULL);
+ WIDGET_INSTANCE_EVENT_CREATE_ABORTED, ret, NULL);
if (ret < 0)
LOGE("Fail to send abort status (%d) ", ret);
__instance_drop(instance_h);
} else {
LOGD("%s is created", id);
ret = __send_update_status(class_id, id,
if (ret < 0)
LOGE("Fail to send abort status (%d) ", ret);
__instance_drop(instance_h);
} else {
LOGD("%s is created", id);
ret = __send_update_status(class_id, id,
- WIDGET_INSTANCE_EVENT_CREATE, NULL);
+ WIDGET_INSTANCE_EVENT_CREATE, 0, NULL);
if (ret < 0)
LOGE("Fail to send create status (%d) ", ret);
if (ret < 0)
LOGE("Fail to send create status (%d) ", ret);
LOGD("%s is resumed", id);
__send_update_status(class_id, id,
LOGD("%s is resumed", id);
__send_update_status(class_id, id,
- WIDGET_INSTANCE_EVENT_RESUME, NULL);
+ WIDGET_INSTANCE_EVENT_RESUME, 0, NULL);
if (!__fg_signal) {
LOGD("Send fg signal to resourceD");
if (!__fg_signal) {
LOGD("Send fg signal to resourceD");
LOGD("%s is paused", id);
__send_update_status(class_id, id,
LOGD("%s is paused", id);
__send_update_status(class_id, id,
- WIDGET_INSTANCE_EVENT_PAUSE, NULL);
+ WIDGET_INSTANCE_EVENT_PAUSE, 0, NULL);
if (__fg_signal) {
LOGD("Send bg signal to resourceD");
if (__fg_signal) {
LOGD("Send bg signal to resourceD");
} else {
__is_permanent = false;
__send_update_status(class_id, id,
} else {
__is_permanent = false;
__send_update_status(class_id, id,
- WIDGET_INSTANCE_EVENT_EXTRA_UPDATED,
+ WIDGET_INSTANCE_EVENT_EXTRA_UPDATED, 0,
if (data->periodic_timer)
g_source_remove(data->periodic_timer);
if (data->periodic_timer)
g_source_remove(data->periodic_timer);
- __send_update_status(class_id, id, event, NULL);
+ __send_update_status(class_id, id, event, 0, NULL);
appcore_multiwindow_base_class_on_terminate(instance_h);
}
appcore_multiwindow_base_class_on_terminate(instance_h);
}