am ec64c30b: am cc52272b: am a3e79199: Merge "TIME_TICK was not occurred for one hour"

* commit 'ec64c30bfc221fea888efe5eac62f7c5303aeeb0':
  TIME_TICK was not occurred for one hour
This commit is contained in:
Christopher Tate
2013-01-11 10:54:46 -08:00
committed by Android Git Automerger

View File

@@ -956,16 +956,12 @@ class AlarmManagerService extends IAlarmManager.Stub {
} }
public void scheduleTimeTickEvent() { public void scheduleTimeTickEvent() {
Calendar calendar = Calendar.getInstance();
final long currentTime = System.currentTimeMillis(); final long currentTime = System.currentTimeMillis();
calendar.setTimeInMillis(currentTime); final long nextTime = 60000 * ((currentTime / 60000) + 1);
calendar.add(Calendar.MINUTE, 1);
calendar.set(Calendar.SECOND, 0);
calendar.set(Calendar.MILLISECOND, 0);
// Schedule this event for the amount of time that it would take to get to // Schedule this event for the amount of time that it would take to get to
// the top of the next minute. // the top of the next minute.
final long tickEventDelay = calendar.getTimeInMillis() - currentTime; final long tickEventDelay = nextTime - currentTime;
set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + tickEventDelay, set(AlarmManager.ELAPSED_REALTIME, SystemClock.elapsedRealtime() + tickEventDelay,
mTimeTickSender); mTimeTickSender);