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

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

Browse Source
This commit is contained in:
Dianne Hackborn
2015-10-15 23:11:12 +00:00
committed by Android (Google) Code Review
parent 6a032a3aba f383129b09
commit 56f4197148
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
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.
@@ -1256,7 +1256,7 @@ class AlarmManagerService extends SystemService {
pw.print(" Idling until: "); pw.print(" Idling until: ");
if (mPendingIdleUntil != null) { if (mPendingIdleUntil != null) {
pw.println(mPendingIdleUntil); pw.println(mPendingIdleUntil);
mPendingIdleUntil.dump(pw, " ", nowRTC, nowELAPSED, sdf); mPendingIdleUntil.dump(pw, " ", nowRTC, nowELAPSED, sdf);
} else { } else {
pw.println("null"); pw.println("null");
} }