Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Adjust future charge start time." into pi-dev

Browse Source 
am: 6c2679d55d

Change-Id: I50245cc669359bd758ddee55311af30e95adbb65
This commit is contained in:
Makoto Onuki
2018-04-30 11:35:22 -07:00
committed by android-build-merger
parent 53de2ed4d3 6c2679d55d
commit a103bc51f7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -4084,7 +4084,8 @@ public class BatteryStatsImpl extends BatteryStats {
boolean ensureStartClockTime(final long currentTime) {
final long ABOUT_ONE_YEAR = 365*24*60*60*1000L;
if (currentTime > ABOUT_ONE_YEAR && mStartClockTime < (currentTime-ABOUT_ONE_YEAR)) {
if ((currentTime > ABOUT_ONE_YEAR && mStartClockTime < (currentTime-ABOUT_ONE_YEAR))
|| (mStartClockTime > currentTime)) {
// If the start clock time has changed by more than a year, then presumably
// the previous time was completely bogus. So we are going to figure out a
// new time based on how much time has elapsed since we started counting.