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

Merge "Eliminate next-alarm-clock broadcast flapping" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-29 21:47:02 +00:00
committed by Android (Google) Code Review
parent c8417676ed c60da1edc1
commit 2bbfe98062
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/AlarmManagerService.java
View File

@@ -1732,9 +1732,10 @@ class AlarmManagerService extends SystemService {
Alarm a = alarms.get(j); Alarm a = alarms.get(j);
if (a.alarmClock != null) { if (a.alarmClock != null) {
final int userId = UserHandle.getUserId(a.uid); final int userId = UserHandle.getUserId(a.uid);
AlarmManager.AlarmClockInfo current = mNextAlarmClockForUser.get(userId);
if (DEBUG_ALARM_CLOCK) { if (DEBUG_ALARM_CLOCK) {
Log.v(TAG, "Found AlarmClockInfo at " + Log.v(TAG, "Found AlarmClockInfo " + a.alarmClock + " at " +
formatNextAlarm(getContext(), a.alarmClock, userId) + formatNextAlarm(getContext(), a.alarmClock, userId) +
" for user " + userId); " for user " + userId);
} }
@@ -1742,6 +1743,10 @@ class AlarmManagerService extends SystemService {
// Alarms and batches are sorted by time, no need to compare times here. // Alarms and batches are sorted by time, no need to compare times here.
if (nextForUser.get(userId) == null) { if (nextForUser.get(userId) == null) {
nextForUser.put(userId, a.alarmClock); nextForUser.put(userId, a.alarmClock);
} else if (a.alarmClock.equals(current)
&& current.getTriggerTime() <= nextForUser.get(userId).getTriggerTime()) {
// same/earlier time and it's the one we cited before, so stick with it
nextForUser.put(userId, current);
} }
} }
} }