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

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

Browse Source 
* commit '20c6a03b4f6aee06421329bb002e466621427a43':
  Convert from elapsed time to absolute time.
This commit is contained in:
Craig Mautner
2014-07-22 16:13:01 +00:00
committed by Android Git Automerger
parent 237f4a3ec8 2117f2550c
commit 66c82ef3c6
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) {