battery : read fails /sys/class/power_supply/battery/capacity at the first access...

When the TW emulator first accesses /sys/class/power_supply/battery/capacity,
it sometimes returns an empty string.

So, lowbat_monitor() is called with 0 parameter.
"0" means that battery level is 0.
When deviced detects battery level 0, it creates a 30 second power off timer.
So the emulator automatically powers off intermittently after 35 seconds.

If an empty string is returned, we modify it to read /sys/clas/power_supply/battery/capacity again.

Signed-off-by: INSUN PYO <insun.pyo@samsung.com>
Change-Id: Ieefd950fe175ef138814624f6a3957ac7432cc74

diff --git a/hw/battery/battery.c b/hw/battery/battery.c
index 5f1601982dedfc754e0e7846161f88787c51e830..583a5c3b8391e352a6c7e0908e7f476a7ffcd1aa 100644 (file)
--- a/hw/battery/battery.c
+++ b/hw/battery/battery.c
@@ -176,6 +176,18 @@ static int battery_get_current_state(
                _E("Failed to get value of (%s, %d)", FILE_BATTERY_CAPACITY, ret);
                return ret;
        }
+
+        /* When the TW emulator first accesses /sys/class/power_supply/battery/capacity,
+           it sometimes returns an empty string. */
+        if (capacity_str[0] == 0) {
+                _E("/sys/class/power_supply/battery/capacity returns null string, retry read it again");
+                ret = sys_get_str(FILE_BATTERY_CAPACITY, capacity_str, sizeof(capacity_str));
+                if (ret < 0) {
+                         _E("Failed to get value of (%s, %d)", FILE_BATTERY_CAPACITY, ret);
+                         return ret;
+                }
+        }
+
        ret = sys_get_str(FILE_BATTERY_CHARGER_ONLINE, charger_str, sizeof(charger_str));
        if (ret < 0) {
                _E("Failed to get value of (%s, %d)", FILE_BATTERY_CHARGER_ONLINE, ret);