Merge "Properly recognize repeating wakeup alarms" into lmp-mr1-dev (3bec5090) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/AlarmManagerService.java

+2 −5

Original line number	Diff line number	Diff line
		@@ -1445,12 +1445,9 @@ class AlarmManagerService extends SystemService {
		maxTriggerTime(nowELAPSED, nextElapsed, alarm.repeatInterval),
		alarm.repeatInterval, alarm.operation, batch.standalone, true,
		alarm.workSource, alarm.alarmClock, alarm.userId);
		}

		// For now we count this as a wakeup alarm, meaning it needs to be
		// delivered immediately. In the future we should change this, but
		// that required delaying when we reschedule the repeat...!
		hasWakeup = false;
		} else if (alarm.wakeup) {
		if (alarm.wakeup) {
		hasWakeup = true;
		}