From 494f6bdd9a6d9bf7dad623128c37813cf9d737c0 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Mon, 21 Jul 2014 11:17:46 -0700 Subject: [PATCH] Convert from elapsed time to absolute time. Using uptime to determine most recent task doesn't work across reboots. Fixes bug 16370277. Change-Id: Icef3342aba3fc009c307175b7524530c4cb617d2 --- services/core/java/com/android/server/am/TaskRecord.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java index 061053aef5cbd..767a970ebe0ba 100644 --- a/services/core/java/com/android/server/am/TaskRecord.java +++ b/services/core/java/com/android/server/am/TaskRecord.java @@ -199,14 +199,14 @@ final class TaskRecord { } void touchActiveTime() { - lastActiveTime = android.os.SystemClock.elapsedRealtime(); + lastActiveTime = System.currentTimeMillis(); if (firstActiveTime == 0) { firstActiveTime = lastActiveTime; } } long getInactiveDuration() { - return android.os.SystemClock.elapsedRealtime() - lastActiveTime; + return System.currentTimeMillis() - lastActiveTime; } void setIntent(Intent _intent, ActivityInfo info) {