Apply libsyscommon gdbus api improvement on error handling

[platform/core/api/device.git] / src / led.c

diff --git a/src/led.c b/src/led.c
index 3f65144..d6b0014 100644 (file)
--- a/src/led.c
+++ b/src/led.c
@@ -19,11 +19,11 @@
 #include <stdbool.h>
 #include <errno.h>
 #include <system_info.h>
+#include <libsyscommon/dbus-system.h>
 
 #include "led.h"
 #include "led-internal.h"
 #include "common.h"
-#include "dbus.h"
 
 #define METHOD_GET_MAX_BRIGHTNESS      "GetMaxBrightness"
 #define METHOD_GET_BRIGHTNESS          "GetBrightness"
@@ -56,7 +56,7 @@ static void __CONSTRUCTOR__ init(void)
 
 int device_flash_get_max_brightness(int *max_brightness)
 {
-       int ret;
+       int ret, val;
 
        if (!support_camera_led)
                return DEVICE_ERROR_NOT_SUPPORTED;
@@ -64,19 +64,19 @@ int device_flash_get_max_brightness(int *max_brightness)
        if (!max_brightness)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret = dbus_method_sync_var(DEVICED_BUS_NAME,
+       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
-                       METHOD_GET_MAX_BRIGHTNESS, NULL);
+                       METHOD_GET_MAX_BRIGHTNESS, NULL, &val);
        if (ret < 0)
                return errno_to_device_error(ret); //LCOV_EXCL_LINE System Error
 
-       *max_brightness = ret;
+       *max_brightness = val;
        return DEVICE_ERROR_NONE;
 }
 
 int device_flash_get_brightness(int *brightness)
 {
-       int ret;
+       int ret, val;
 
        if (!support_camera_led)
                return DEVICE_ERROR_NOT_SUPPORTED;
@@ -84,13 +84,13 @@ int device_flash_get_brightness(int *brightness)
        if (!brightness)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret = dbus_method_sync_var(DEVICED_BUS_NAME,
+       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
-                       METHOD_GET_BRIGHTNESS, NULL);
+                       METHOD_GET_BRIGHTNESS, NULL, &val);
        if (ret < 0)
                return errno_to_device_error(ret); //LCOV_EXCL_LINE System Error
 
-       *brightness = ret;
+       *brightness = val;
        return DEVICE_ERROR_NONE;
 }
 
@@ -109,9 +109,9 @@ int device_flash_set_brightness(int brightness)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
        /* if camera API preempt a flash device, it will return -EBUSY error. */
-       ret = dbus_method_sync_var(DEVICED_BUS_NAME,
+       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
-                       METHOD_SET_BRIGHTNESS, g_variant_new("(ii)", brightness, 0));
+                       METHOD_SET_BRIGHTNESS, g_variant_new("(ii)", brightness, 0), NULL);
        if (ret < 0)
                return errno_to_device_error(ret); //LCOV_EXCL_LINE System Error
 
@@ -128,13 +128,14 @@ int device_led_play_custom(int on, int off, unsigned int color, unsigned int fla
        if (on < 0 || off < 0)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
-       ret = dbus_method_sync_var(DEVICED_BUS_NAME,
+       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
-                       METHOD_PLAY_CUSTOM, g_variant_new("(iiuu)", on, off, (unsigned int)color, (unsigned int)flags));
+                       METHOD_PLAY_CUSTOM, g_variant_new("(iiuu)", on, off, (unsigned int)color, (unsigned int)flags), NULL);
 //LCOV_EXCL_START System Error
        if (ret < 0)
                return errno_to_device_error(ret);
 //LCOV_EXCL_STOP
+
        return DEVICE_ERROR_NONE;
 }
 
@@ -145,9 +146,9 @@ int device_led_stop_custom(void)
        if (!support_front_led)
                return DEVICE_ERROR_NOT_SUPPORTED;
 
-       ret = dbus_method_sync_var(DEVICED_BUS_NAME,
+       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                        DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
-                       METHOD_STOP_CUSTOM, NULL);
+                       METHOD_STOP_CUSTOM, NULL, NULL);
 //LCOV_EXCL_START System Error
        if (ret < 0)
                return errno_to_device_error(ret);
@@ -156,10 +157,10 @@ int device_led_stop_custom(void)
        return DEVICE_ERROR_NONE;
 }
 
-//LCOV_EXCL_START Not used function
+//LCOV_EXCL_START Not tested API
 int device_multi_led_get_number(int *num_of_leds)
 {
-       int ret;
+       int ret, val;
 
        if (!support_front_led)
                return DEVICE_ERROR_NOT_SUPPORTED;
@@ -168,19 +169,21 @@ int device_multi_led_get_number(int *num_of_leds)
                return DEVICE_ERROR_INVALID_PARAMETER;
 
        if (number_of_devices < 0) {
-               ret = dbus_method_sync_var(DEVICED_BUS_NAME,
+               ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME,
                                DEVICED_PATH_LED, DEVICED_INTERFACE_LED,
-                               METHOD_GET_LED_NUMBER, NULL);
+                               METHOD_GET_LED_NUMBER, NULL, &val);
                if (ret < 0)
                        return errno_to_device_error(ret); //LCOV_EXCL_LINE System Error
-               number_of_devices = ret;
+               number_of_devices = val;
        }
 
        *num_of_leds = number_of_devices;
 
        return DEVICE_ERROR_NONE;
 }
+//LCOV_EXCL_STOP
 
+//LCOV_EXCL_START Not tested API
 int device_multi_led_control(unsigned int color[])
 {
        GVariantBuilder *builder = NULL;
@@ -206,7 +209,11 @@ int device_multi_led_control(unsigned int color[])
        var = g_variant_new("(au)", builder);
        g_variant_builder_unref(builder);
 
-       return dbus_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_LED,
-                               DEVICED_INTERFACE_LED, METHOD_MULTI_LED_CONTROL, var);
+       ret = dbus_handle_method_sync_var(DEVICED_BUS_NAME, DEVICED_PATH_LED,
+                               DEVICED_INTERFACE_LED, METHOD_MULTI_LED_CONTROL, var, NULL);
+       if (ret < 0)
+               return errno_to_device_error(ret); //LCOV_EXCL_LINE System Error
+
+       return DEVICE_ERROR_NONE;
 }
 //LCOV_EXCL_STOP