[Non-ACR] Fix battery monitor bugs

Change-Id: Ic94d619e1d4efdd97f95338cae1c5474d24143e2
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/src/server/battery-stats/BatteryMonitor.cpp b/src/server/battery-stats/BatteryMonitor.cpp
index 22d9fd2..d557113 100644 (file)
--- a/src/server/battery-stats/BatteryMonitor.cpp
+++ b/src/server/battery-stats/BatteryMonitor.cpp
@@ -124,13 +124,16 @@ bool BatteryMonitor::__loadLastInfo()
                __updateLastInfo();
        }
 
+       if (__lastHeartAccessTime == 0)
+               __lastHeartAccessTime = currentTime - DEFAULT_TIME_DIFF;
+
        return true;
 }
 
 bool BatteryMonitor::__updateLastInfo()
 {
        char *query = sqlite3_mprintf("INSERT OR REPLACE INTO " BATTERY_LAST_INFO_TABLE " (" \
-                       BATTERY_ROW_ID ", " BATTERY_LAST_FULL_TIME ", " BATTERY_LAST_HEART_ACCESS_TIME ") VALUES (%s, %d, %d)",
+                       BATTERY_ROW_ID ", " BATTERY_LAST_FULL_TIME ", " BATTERY_LAST_HEART_ACCESS_TIME ") VALUES (%s, %lld, %lld)",
                        DEFAULT_ROW_ID_STR, __lastFullTime, __lastHeartAccessTime);
        bool ret = __database->execute(query, NULL);
        sqlite3_free(query);
@@ -276,7 +279,8 @@ bool BatteryMonitor::__processBatteryUsage()
 
        IF_FAIL_RETURN_TAG(ret, true, _E, "Cannot read from heart cpu table");
        IF_FAIL_RETURN_TAG(heartCpuLog.size() > 0, true, _W, "Heart cpu data is not prepared");
-       _D("Read %d rows from heart cpu table from %d", heartCpuLog.size(), __lastHeartAccessTime);
+       _D("Read %d rows from heart cpu table from %lld", \
+                               heartCpuLog.size(), (long long int)__lastHeartAccessTime);
 
        __lastHeartAccessTime = heartCpuLog.back()[BATTERY_TIMESTAMP].asInt64();
        __updateLastInfo();

diff --git a/src/server/battery-stats/HeartDbReader.cpp b/src/server/battery-stats/HeartDbReader.cpp
index 650a11e..f67e442 100644 (file)
--- a/src/server/battery-stats/HeartDbReader.cpp
+++ b/src/server/battery-stats/HeartDbReader.cpp
@@ -144,7 +144,7 @@ int HeartDbReader::__cpuUsageLogCb(void *userData, int dim, char **value, char *
                return jval;
        };
 
-       records->push_back(convToJson(row));
+       records->push_back(std::move(convToJson(row)));
 
        return 0;
 }