Merge "Allow setting alarm to the same time as an earlier one" (ab0c14cd) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -2584,7 +2584,7 @@ class AlarmManagerService extends SystemService {
		if (mAlarmBatches.size() > 0) {
		final Batch firstWakeup = findFirstWakeupBatchLocked();
		final Batch firstBatch = mAlarmBatches.get(0);
		if (firstWakeup != null && mNextWakeup != firstWakeup.start) {
		if (firstWakeup != null) {
		mNextWakeup = firstWakeup.start;
		mLastWakeupSet = SystemClock.elapsedRealtime();
		setLocked(ELAPSED_REALTIME_WAKEUP, firstWakeup.start);
		@@ -2598,7 +2598,7 @@ class AlarmManagerService extends SystemService {
		nextNonWakeup = mNextNonWakeupDeliveryTime;
		}
		}
		if (nextNonWakeup != 0 && mNextNonWakeup != nextNonWakeup) {
		if (nextNonWakeup != 0) {
		mNextNonWakeup = nextNonWakeup;
		setLocked(ELAPSED_REALTIME, nextNonWakeup);
		}
		@@ -3229,6 +3229,8 @@ class AlarmManagerService extends SystemService {
		expectedMaxWhenElapsed, nowELAPSED, pw);
		pw.print(" whenElapsed="); TimeUtils.formatDuration(whenElapsed,
		nowELAPSED, pw);
		pw.print(" maxWhenElapsed="); TimeUtils.formatDuration(maxWhenElapsed,
		nowELAPSED, pw);
		pw.print(" when=");
		if (isRtc) {
		pw.print(sdf.format(new Date(when)));