Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge \\\"Handle alarm firing outside of DND period.\\\" into nyc-dev am: e1451c4e30 am: 5431ee2aca

Browse Source 
am: 2a6f616385

Change-Id: I87ba4667946581206a53430932a7e37a98b96736
This commit is contained in:
Julia Reynolds
2016-06-08 19:03:41 +00:00
committed by android-build-merger
parent 5493f0f6a2 2a6f616385
commit 98616abf72
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/notification/ScheduleCalendar.java
View File

@@ -58,11 +58,7 @@ 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;
}
return nextScheduleTime;
}
private long getNextTime(long now, int hr, int min) {
@@ -124,4 +120,4 @@ public class ScheduleCalendar {
mCalendar.add(Calendar.DATE, days);
return mCalendar.getTimeInMillis();
}
}
}

7
services/core/java/com/android/server/notification/ScheduleConditionProvider.java
View File

@@ -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);