Merge "Fix the build error in aarch64" into tizen

diff --git a/bt-service-adaptation/services/bt-request-handler.c b/bt-service-adaptation/services/bt-request-handler.c
index 28a950a..a5ad048 100644 (file)
--- a/bt-service-adaptation/services/bt-request-handler.c
+++ b/bt-service-adaptation/services/bt-request-handler.c
@@ -1898,10 +1898,10 @@ int __bt_bluez_request(int function_name,
 
                __bt_service_get_parameters(in_param1,
                                adv_handle, sizeof(int));
-               __bt_service_get_parameters(in_param2,
-                               &adv, sizeof(bluetooth_advertising_data_t));
                __bt_service_get_parameters(in_param3,
                                &length, sizeof(int));
+               __bt_service_get_parameters(in_param2,
+                               &adv, length);
                __bt_service_get_parameters(in_param4,
                                &use_reserved_slot, sizeof(gboolean));
                result = _bt_set_advertising_data(app, *adv_handle,
@@ -1927,10 +1927,10 @@ int __bt_bluez_request(int function_name,
 
                __bt_service_get_parameters(in_param1,
                                adv_handle, sizeof(int));
-               __bt_service_get_parameters(in_param2,
-                               &rsp, sizeof(bluetooth_scan_resp_data_t));
                __bt_service_get_parameters(in_param3,
                                &length, sizeof(int));
+               __bt_service_get_parameters(in_param2,
+                               &rsp, length);
                __bt_service_get_parameters(in_param4,
                                &use_reserved_slot, sizeof(gboolean));
 

diff --git a/bt-service-adaptation/services/health/bt-service-hdp.c b/bt-service-adaptation/services/health/bt-service-hdp.c
index fb3519d..1ef5cb2 100644 (file)
--- a/bt-service-adaptation/services/health/bt-service-hdp.c
+++ b/bt-service-adaptation/services/health/bt-service-hdp.c
@@ -92,7 +92,7 @@ static void __bt_hdp_handle_pending_request_info(int result,
                        BT_DBG("app_handle: %s", app_handle);
 
                        out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
-                       g_array_append_vals(out_param, app_handle, BT_MAX_HANDLE_LENGTH);
+                       g_array_append_vals(out_param, app_handle, strlen(app_handle));
                        _bt_service_method_return(req_info->context, out_param, result);
                        g_free(req_info->user_data);
                        _bt_free_info_from_invocation_list(req_info);