From d504138ba887844970a6c088f861b7062582f511 Mon Sep 17 00:00:00 2001 From: Somin Kim Date: Wed, 30 Nov 2016 15:37:54 +0900 Subject: [PATCH] Modify recnet battery usage to return data after booting, if device never fully charged. Change-Id: I01f9e9f62271094a6e10f4fec00eeba71fda1fb4 Signed-off-by: Somin Kim --- src/battery-stats/BatteryMonitor.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/battery-stats/BatteryMonitor.cpp b/src/battery-stats/BatteryMonitor.cpp index 4352019..9a11562 100644 --- a/src/battery-stats/BatteryMonitor.cpp +++ b/src/battery-stats/BatteryMonitor.cpp @@ -27,6 +27,7 @@ using namespace ctx; +static int __bootingTime = 0; static int __lastResetTime = 0; static int __lastPercent = -1; static int __lastPercentTime = 0; @@ -64,6 +65,8 @@ void BatteryMonitor::__initialize() bool BatteryMonitor::__loadLastInfo() { + __bootingTime = CURRENT_TIME; + device_battery_is_charging(&__isCharging); std::vector records; @@ -355,8 +358,13 @@ bool BatteryMonitor::__insertLastCpuUsageLog(CpuUsageMap& usage) return __dbMgr.executeSync(query.c_str(), NULL); } +// Used for Recent Battery Usage int BatteryMonitor::getLastResetTime() { - IF_FAIL_RETURN_TAG(__lastResetTime != 0, CURRENT_TIME, _D, "Last reset time doesn't exist"); + if (__lastResetTime == 0) { + _I("Device has not fully charged until now. Start time of recent battery usage will be booting time"); + return __bootingTime; + } + return __lastResetTime; } -- 2.7.4