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

Work on issue #27995384: Time in the top bar different...

Browse Source 
...from time in the clock app

Always reset the kernel's next wake up time when we come
out of it, even if it didn't say an alarm went off.

Also add some more debugging to try to figure out what is
going on.

Change-Id: Ibf36d65b78c841128774d81517a7eb670c396c29
This commit is contained in:
Dianne Hackborn
2016-05-23 15:59:18 -07:00
parent 5ee420c0d5
commit aa9a59d410
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -125,6 +125,8 @@ class AlarmManagerService extends SystemService {
long mNativeData;
private long mNextWakeup;
private long mNextNonWakeup;
private long mLastWakeupSet;
private long mLastWakeup;
int mBroadcastRefCount = 0;
PowerManager.WakeLock mWakeLock;
boolean mLastWakeLockUnimportantForLogging;
@@ -1400,6 +1402,9 @@ class AlarmManagerService extends SystemService {
pw.print(" = "); pw.println(sdf.format(new Date(nextNonWakeupRTC)));
pw.print(" Next wakeup: "); TimeUtils.formatDuration(mNextWakeup, nowELAPSED, pw);
pw.print(" = "); pw.println(sdf.format(new Date(nextWakeupRTC)));
pw.print(" Last wakeup: "); TimeUtils.formatDuration(mLastWakeup, nowELAPSED, pw);
pw.print(" set at "); TimeUtils.formatDuration(mLastWakeupSet, nowELAPSED, pw);
pw.println();
pw.print(" Num time change events: "); pw.println(mNumTimeChanged);
pw.println(" mDeviceIdleUserWhitelist=" + Arrays.toString(mDeviceIdleUserWhitelist));
@@ -1838,6 +1843,7 @@ class AlarmManagerService extends SystemService {
final Batch firstBatch = mAlarmBatches.get(0);
if (firstWakeup != null && mNextWakeup != firstWakeup.start) {
mNextWakeup = firstWakeup.start;
mLastWakeupSet = SystemClock.elapsedRealtime();
setLocked(ELAPSED_REALTIME_WAKEUP, firstWakeup.start);
}
if (firstBatch != firstWakeup) {
@@ -2436,6 +2442,7 @@ class AlarmManagerService extends SystemService {
while (true)
{
int result = waitForAlarm(mNativeData);
mLastWakeup = SystemClock.elapsedRealtime();
triggerList.clear();
@@ -2536,6 +2543,11 @@ class AlarmManagerService extends SystemService {
deliverAlarmsLocked(triggerList, nowELAPSED);
}
}
} else {
// Just in case -- even though no wakeup flag was set, make sure
// we have updated the kernel to the next alarm time.
rescheduleKernelAlarmsLocked();
}
}
}