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

am 510f03c5: am 56f41971: Merge "Fix issue #24571425: Device does not come out of idle mode for maintenance" into mnc-dr-dev

Browse Source 
* commit '510f03c5ac057122569264bd005b2e26f96236ae':
  Fix issue #24571425: Device does not come out of idle mode for maintenance
This commit is contained in:
Dianne Hackborn
2015-10-15 23:19:06 +00:00
committed by Android Git Automerger
parent b36aebbe69 510f03c5ac
commit 401f68b93a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -971,8 +971,8 @@ class AlarmManagerService extends SystemService {
// This is a special alarm that will put the system into idle until it goes off. // This is a special alarm that will put the system into idle until it goes off.
// The caller has given the time they want this to happen at, however we need // The caller has given the time they want this to happen at, however we need
// to pull that earlier if there are existing alarms that have requested to // to pull that earlier if there are existing alarms that have requested to
// bring us out of idle. // bring us out of idle at an earlier time.
if (mNextWakeFromIdle != null) { if (mNextWakeFromIdle != null && a.whenElapsed > mNextWakeFromIdle.whenElapsed) {
a.when = a.whenElapsed = a.maxWhenElapsed = mNextWakeFromIdle.whenElapsed; a.when = a.whenElapsed = a.maxWhenElapsed = mNextWakeFromIdle.whenElapsed;
} }
// Add fuzz to make the alarm go off some time before the actual desired time. // Add fuzz to make the alarm go off some time before the actual desired time.