update battery level control routine

Signed-off-by: Giyeol Ok <giyeol.ok@samsung.com>
Change-Id: I9ccb668c2941a6fb7ef4036a76cd17af2a38976d

diff --git a/packaging/system-server.spec b/packaging/system-server.spec
index df7b1e2..d3de072 100755 (executable)
--- a/packaging/system-server.spec
+++ b/packaging/system-server.spec
@@ -2,7 +2,7 @@
 Name:       system-server
 Summary:    System server
 Version: 0.1.63
-Release:    2
+Release:    3
 Group:      Framework/system
 License:    Apache License, Version 2.0
 Source0:    system-server-%{version}.tar.gz

diff --git a/ss_lowbat_handler.c b/ss_lowbat_handler.c
index 44cfbab..619e1ba 100755 (executable)
--- a/ss_lowbat_handler.c
+++ b/ss_lowbat_handler.c
@@ -275,9 +275,9 @@ static void __ss_change_lowbat_level(int bat_percent)
        if (prev != now)
                vconf_set_int(VCONFKEY_SYSMAN_BATTERY_LEVEL_STATUS, now);
 }
-int ss_lowbat_monitor(void *data)
+
+static int __check_lowbat_percent(void)
 {
-       struct ss_main_data *ad = (struct ss_main_data *)data;
        int bat_percent;
 
        bat_percent = lowbat_read();
@@ -287,13 +287,21 @@ int ss_lowbat_monitor(void *data)
                if (bat_err_count > MAX_BATTERY_ERROR) {
                        PRT_TRACE_ERR
                            ("[BATMON] Cannot read battery gage. stop read fuel gage");
-                       return 0;
                }
-               return 1;
+               return -1;
        }
        if (bat_percent > 100)
                bat_percent = 100;
        __ss_change_lowbat_level(bat_percent);
+       return bat_percent;
+}
+
+int ss_lowbat_monitor(void *data)
+{
+       struct ss_main_data *ad = (struct ss_main_data *)data;
+       int bat_percent;
+
+       bat_percent = __check_lowbat_percent();
 
        if (lowbat_process(bat_percent, ad) < 0)
                ecore_timer_interval_set(lowbat_timer, BAT_MON_INTERVAL_MIN);
@@ -335,7 +343,9 @@ int ss_lowbat_init(struct ss_main_data *ad)
        /* need check battery */
        lowbat_timer =
            ecore_timer_add(BAT_MON_INTERVAL_MIN, ss_lowbat_monitor, ad);
-       __ss_change_lowbat_level(bat_percent);
+
+       __check_lowbat_percent();
+
        ss_lowbat_is_charge_in_now();
 
        vconf_notify_key_changed(VCONFKEY_PM_STATE, (void *)wakeup_cb, NULL);