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

am 012de64e: Merge "Fix bugs regarding delay the dispatching of non-wakeup alarms"

Browse Source 
* commit '012de64e2dade079979bfa6cdca323b36901a0e6':
  Fix bugs regarding delay the dispatching of non-wakeup alarms
This commit is contained in:
Christopher Tate
2014-12-12 22:37:47 +00:00
committed by Android Git Automerger
parent 0e954dccab 012de64e2d
commit 125579caa1
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1587,7 +1587,7 @@ class AlarmManagerService extends SystemService {
if (mLastAlarmDeliveryTime <= 0) {
return false;
}
if (mPendingNonWakeupAlarms.size() > 0 && mNextNonWakeupDeliveryTime > nowELAPSED) {
if (mPendingNonWakeupAlarms.size() > 0 && mNextNonWakeupDeliveryTime < nowELAPSED) {
// This is just a little paranoia, if somehow we have pending non-wakeup alarms
// and the next delivery time is in the past, then just deliver them all. This
// avoids bugs where we get stuck in a loop trying to poll for alarms.