Merge \\"Handle alarm firing outside of DND period.\\" into nyc-dev am: e1451c4e30 (2a6f6163) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/ScheduleCalendar.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -58,12 +58,8 @@ public class ScheduleCalendar {
		final long nextEnd = getNextTime(now, mSchedule.endHour, mSchedule.endMinute);
		long nextScheduleTime = Math.min(nextStart, nextEnd);

		if (mSchedule.exitAtAlarm && mSchedule.nextAlarm > now) {
		return Math.min(nextScheduleTime, mSchedule.nextAlarm);
		} else {
		return nextScheduleTime;
		}
		}

		private long getNextTime(long now, int hr, int min) {
		final long time = getTime(now, hr, min);

+5 −2

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ import java.util.TimeZone;
		* Built-in zen condition provider for daily scheduled time-based conditions.
		*/
		public class ScheduleConditionProvider extends SystemConditionProviderService {
		private static final String TAG = "ConditionProviders.SCP";
		private static final boolean DEBUG = true \|\| Log.isLoggable("ConditionProviders", Log.DEBUG);
		static final String TAG = "ConditionProviders.SCP";
		static final boolean DEBUG = true \|\| Log.isLoggable("ConditionProviders", Log.DEBUG);

		public static final ComponentName COMPONENT =
		new ComponentName("android", ScheduleConditionProvider.class.getName());
		@@ -154,6 +154,9 @@ public class ScheduleConditionProvider extends SystemConditionProviderService {
		cal.maybeSetNextAlarm(now, nextUserAlarmTime);
		} else {
		notifyCondition(conditionId, Condition.STATE_FALSE, "!meetsSchedule");
		if (nextUserAlarmTime == 0) {
		cal.maybeSetNextAlarm(now, nextUserAlarmTime);
		}
		}
		if (cal != null) {
		final long nextChangeTime = cal.getNextChangeTime(now);