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

Merge "Work on issue #27995384: Time in the top bar different..." into nyc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2016-05-24 16:56:00 +00:00
committed by Android (Google) Code Review
parent 2a4001ee62 aa9a59d410
commit cdcc53d007
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; long mNativeData;
private long mNextWakeup; private long mNextWakeup;
private long mNextNonWakeup; private long mNextNonWakeup;
private long mLastWakeupSet;
private long mLastWakeup;
int mBroadcastRefCount = 0; int mBroadcastRefCount = 0;
PowerManager.WakeLock mWakeLock; PowerManager.WakeLock mWakeLock;
boolean mLastWakeLockUnimportantForLogging; boolean mLastWakeLockUnimportantForLogging;
@@ -1400,6 +1402,9 @@ class AlarmManagerService extends SystemService {
pw.print(" = "); pw.println(sdf.format(new Date(nextNonWakeupRTC))); pw.print(" = "); pw.println(sdf.format(new Date(nextNonWakeupRTC)));
pw.print(" Next wakeup: "); TimeUtils.formatDuration(mNextWakeup, nowELAPSED, pw); pw.print(" Next wakeup: "); TimeUtils.formatDuration(mNextWakeup, nowELAPSED, pw);
pw.print(" = "); pw.println(sdf.format(new Date(nextWakeupRTC))); 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.print(" Num time change events: "); pw.println(mNumTimeChanged);
pw.println(" mDeviceIdleUserWhitelist=" + Arrays.toString(mDeviceIdleUserWhitelist)); pw.println(" mDeviceIdleUserWhitelist=" + Arrays.toString(mDeviceIdleUserWhitelist));
@@ -1838,6 +1843,7 @@ class AlarmManagerService extends SystemService {
final Batch firstBatch = mAlarmBatches.get(0); final Batch firstBatch = mAlarmBatches.get(0);
if (firstWakeup != null && mNextWakeup != firstWakeup.start) { if (firstWakeup != null && mNextWakeup != firstWakeup.start) {
mNextWakeup = firstWakeup.start; mNextWakeup = firstWakeup.start;
mLastWakeupSet = SystemClock.elapsedRealtime();
setLocked(ELAPSED_REALTIME_WAKEUP, firstWakeup.start); setLocked(ELAPSED_REALTIME_WAKEUP, firstWakeup.start);
} }
if (firstBatch != firstWakeup) { if (firstBatch != firstWakeup) {
@@ -2436,6 +2442,7 @@ class AlarmManagerService extends SystemService {
while (true) while (true)
{ {
int result = waitForAlarm(mNativeData); int result = waitForAlarm(mNativeData);
mLastWakeup = SystemClock.elapsedRealtime();
triggerList.clear(); triggerList.clear();
@@ -2536,6 +2543,11 @@ class AlarmManagerService extends SystemService {
deliverAlarmsLocked(triggerList, nowELAPSED); 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();
} }
} }
} }