commit f013e1afd1e68af5e3b868c26a653bbfb39538f8
author The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:05:43 2008 -0800
committer The Android Open Source Project <initial-contribution@android.com> Wed Dec 17 18:05:43 2008 -0800
tree 7ad6c8fd9c7b55f4b4017171dec1cb760bbd26bf
parent e70cfafe580c6f2994c4827cd8a534aabf3eb05c

Code drop from //branches/cupcake/...@124589

services/java/com/android/server/Watchdog.java

diff --git a/services/java/com/android/server/Watchdog.java b/services/java/com/android/server/Watchdog.java
index 70f54ca..70c3110 100644
--- a/services/java/com/android/server/Watchdog.java
+++ b/services/java/com/android/server/Watchdog.java
@@ -783,7 +783,15 @@
         c.set(Calendar.SECOND, (int)secondsSinceMidnight - (val*60));
         c.set(Calendar.MILLISECOND, 0);
         
-        return c.getTimeInMillis();
+        long newTime = c.getTimeInMillis();
+        if (newTime < curTime) {
+            // The given time (in seconds since midnight) has already passed for today, so advance
+            // by one day (due to daylight savings, etc., the delta may differ from 24 hours).
+            c.add(Calendar.DAY_OF_MONTH, 1);
+            newTime = c.getTimeInMillis();
+        }
+            
+        return newTime;
     }
     
     @Override