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

Merge "DO NOT MERGE ANYWHERE Revert "Always re-establish kernel alarms when considering new alarm set"" into lmp-mr1-modular-dev

Browse Source
This commit is contained in:
Prashant Malani
2015-06-11 23:36:42 +00:00
committed by Android (Google) Code Review
parent 81babaa318 d19ffd4f2c
commit 786cd12f78
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1230,8 +1230,7 @@ class AlarmManagerService extends SystemService {
if (mAlarmBatches.size() > 0) { if (mAlarmBatches.size() > 0) {
final Batch firstWakeup = findFirstWakeupBatchLocked(); final Batch firstWakeup = findFirstWakeupBatchLocked();
final Batch firstBatch = mAlarmBatches.get(0); final Batch firstBatch = mAlarmBatches.get(0);
// always update the kernel alarms, as a backstop against missed wakeups if (firstWakeup != null && mNextWakeup != firstWakeup.start) {
if (firstWakeup != null) {
mNextWakeup = firstWakeup.start; mNextWakeup = firstWakeup.start;
setLocked(ELAPSED_REALTIME_WAKEUP, firstWakeup.start); setLocked(ELAPSED_REALTIME_WAKEUP, firstWakeup.start);
} }
@@ -1244,8 +1243,7 @@ class AlarmManagerService extends SystemService {
nextNonWakeup = mNextNonWakeupDeliveryTime; nextNonWakeup = mNextNonWakeupDeliveryTime;
} }
} }
// always update the kernel alarm, as a backstop against missed wakeups if (nextNonWakeup != 0 && mNextNonWakeup != nextNonWakeup) {
if (nextNonWakeup != 0) {
mNextNonWakeup = nextNonWakeup; mNextNonWakeup = nextNonWakeup;
setLocked(ELAPSED_REALTIME, nextNonWakeup); setLocked(ELAPSED_REALTIME, nextNonWakeup);
} }