Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e8294bc authored by Makoto Onuki's avatar Makoto Onuki Committed by android-build-merger
Browse files

Merge "Adjust future charge start time." into pi-dev am: 6c2679d5 

am: a103bc51

Change-Id: I52ff1e259f17716b6cfeebb32d332116f7b9f790
parents 59667fe0 a103bc51

core/java/com/android/internal/os/BatteryStatsImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -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.