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

diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 061053a..767a970 100644 (file)
--- 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) {