Merge 'master' branch into tizen_2.1

diff --git a/packaging/devman.spec b/packaging/devman.spec
index f08788f..112c339 100644 (file)
--- a/packaging/devman.spec
+++ b/packaging/devman.spec
@@ -2,7 +2,7 @@
 Name:       devman
 Summary:    Device manager library
 Version:    0.1.10
-Release:    0
+Release:    1
 Group:      System/Libraries
 License:    Apache License, Version 2.0
 Source0:    %{name}-%{version}.tar.gz

diff --git a/src/if_legacy.c b/src/if_legacy.c
index cd3402b..32e2fc7 100644 (file)
--- a/src/if_legacy.c
+++ b/src/if_legacy.c
@@ -153,6 +153,10 @@ API int device_set_display_brt_with_settings(display_num_t lcdnum, int val)
                DEVERR("Failed to set VCONFKEY_SETAPPL_LCD_BRIGHTNESS value");
        }
 
+       if (vconf_set_int(VCONFKEY_PM_CURRENT_BRIGHTNESS, val) != 0) {
+               DEVERR("Failed to set VCONFKEY_PM_CURRENT_BRIGHTNESS value");
+       }
+
        return DEVMAN_ERROR_NONE;
 }
 
@@ -189,6 +193,10 @@ API int device_set_display_brt(display_num_t lcdnum, int val)
                vconf_set_int(VCONFKEY_SETAPPL_BRIGHTNESS_AUTOMATIC_INT, SETTING_BRIGHTNESS_AUTOMATIC_PAUSE);
        }
 
+       if (vconf_set_int(VCONFKEY_PM_CURRENT_BRIGHTNESS, val) != 0) {
+               DEVERR("Failed to set VCONFKEY_PM_CURRENT_BRIGHTNESS value");
+       }
+
        if (!disp_flag)
                ret = display_register_postjob();
        if (ret == 0)