Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2117f255 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

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

* commit '6b558a183057c352a20d549e355ad54e9446cb38':
  Convert from elapsed time to absolute time.
parents 22d79153 06e950b9

services/core/java/com/android/server/am/TaskRecord.java

+2 −2
Original line number Diff line number Diff line
@@ -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) {