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

am 3c36d587: Merge "Convert from elapsed time to absolute time." into lmp-dev

Browse Source 
* commit '3c36d58756e022067f6a333aa86114970ed73834':
  Convert from elapsed time to absolute time.
This commit is contained in:
Craig Mautner
2014-07-22 13:53:13 +00:00
committed by Android Git Automerger
parent 9c20e55c2e 807badbebc
commit 06e950b969
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -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) {