Merge "Alarm: keep the alarm which is the 2 minutes upcoming power off alarm" (4116f132) · Commits · e / os / android_frameworks_base

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

+1 −6

Original line number	Original line	Diff line number	Diff line
	@@ -78,10 +78,6 @@ class AlarmManagerService extends SystemService {
	// warning message. The time duration is in milliseconds.		// warning message. The time duration is in milliseconds.
	private static final long LATE_ALARM_THRESHOLD = 10 * 1000;		private static final long LATE_ALARM_THRESHOLD = 10 * 1000;

	// The threshold for the power off alarm time can be set. The time
	// duration is in milliseconds.
	private static final long POWER_OFF_ALARM_THRESHOLD = 120 * 1000;

	private static final int RTC_WAKEUP_MASK = 1 << RTC_WAKEUP;		private static final int RTC_WAKEUP_MASK = 1 << RTC_WAKEUP;
	private static final int RTC_MASK = 1 << RTC;		private static final int RTC_MASK = 1 << RTC;
	private static final int ELAPSED_REALTIME_WAKEUP_MASK = 1 << ELAPSED_REALTIME_WAKEUP;		private static final int ELAPSED_REALTIME_WAKEUP_MASK = 1 << ELAPSED_REALTIME_WAKEUP;
	@@ -1148,8 +1144,7 @@ class AlarmManagerService extends SystemService {
	final int N = mAlarmBatches.size();		final int N = mAlarmBatches.size();
	for (int i = 0; i < N; i++) {		for (int i = 0; i < N; i++) {
	Batch b = mAlarmBatches.get(i);		Batch b = mAlarmBatches.get(i);
	long intervalTime = b.start - SystemClock.elapsedRealtime();		if (b.isRtcPowerOffWakeup()) {
	if (b.isRtcPowerOffWakeup() && intervalTime > POWER_OFF_ALARM_THRESHOLD) {
	return b;		return b;
	}		}
	}		}