From 62b3c92cbc5b4830540767b9800e1290f3678180 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Wed, 25 Apr 2018 14:51:56 -0700
Subject: [PATCH] Adjust future charge start time.

Change-Id: Id10508a917a47a767614dee5a55f0ca7dbbae6bb
Fixes: 70606388
Test: Manual test with forwarding the clock and rewinding it with "cmd battery".
---
 core/java/com/android/internal/os/BatteryStatsImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index a4680cab4b567..663aac0f7cffc 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -4083,7 +4083,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.